提交 54964f56 编写于 作者: A Andrea Bolognani

qemu: Format spapr-vio addresses as 32-bit

No reason not to be consistent with the user-visible value.
Signed-off-by: NAndrea Bolognani <abologna@redhat.com>
Reviewed-by: NMichal Privoznik <mprivozn@redhat.com>
上级 fb91763d
...@@ -395,7 +395,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, ...@@ -395,7 +395,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
} }
} else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) { } else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) {
if (info->addr.spaprvio.has_reg) if (info->addr.spaprvio.has_reg)
virBufferAsprintf(buf, ",reg=0x%llx", info->addr.spaprvio.reg); virBufferAsprintf(buf, ",reg=0x%08llx", info->addr.spaprvio.reg);
} else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { } else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) {
if (info->addr.ccw.assigned) if (info->addr.ccw.assigned)
virBufferAsprintf(buf, ",devno=%x.%x.%04x", virBufferAsprintf(buf, ",devno=%x.%x.%04x",
......
...@@ -30,7 +30,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ ...@@ -30,7 +30,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-device lsi,id=scsi0,bus=pci.0,addr=0x2 \ -device lsi,id=scsi0,bus=pci.0,addr=0x2 \
-device megasas,id=scsi1,bus=pci.0,addr=0x3 \ -device megasas,id=scsi1,bus=pci.0,addr=0x3 \
-device mptsas1068,id=scsi2,bus=pci.0,addr=0x4 \ -device mptsas1068,id=scsi2,bus=pci.0,addr=0x4 \
-device spapr-vscsi,id=scsi3,reg=0x2000 \ -device spapr-vscsi,id=scsi3,reg=0x00002000 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \ -drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \
......
...@@ -23,7 +23,7 @@ server,nowait \ ...@@ -23,7 +23,7 @@ server,nowait \
-mon chardev=charmonitor,id=monitor,mode=control \ -mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \ -rtc base=utc \
-no-shutdown \ -no-shutdown \
-device spapr-vscsi,id=scsi0,reg=0x2000 \ -device spapr-vscsi,id=scsi0,reg=0x00002000 \
-device spapr-vscsi,id=scsi1,reg=0x30000000 \ -device spapr-vscsi,id=scsi1,reg=0x30000000 \
-usb \ -usb \
-drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi1-0-0-0 \ -drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi1-0-0-0 \
......
...@@ -23,8 +23,8 @@ server,nowait \ ...@@ -23,8 +23,8 @@ server,nowait \
-mon chardev=charmonitor,id=monitor,mode=control \ -mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \ -rtc base=utc \
-no-shutdown \ -no-shutdown \
-device spapr-vscsi,id=scsi0,reg=0x2000 \ -device spapr-vscsi,id=scsi0,reg=0x00002000 \
-device spapr-vscsi,id=scsi1,reg=0x3000 \ -device spapr-vscsi,id=scsi1,reg=0x00003000 \
-usb \ -usb \
-drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi1-0-0-0 \ -drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi1-0-0-0 \
-device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\ -device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,\
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册