[libvirt] [PATCH 5/7] conf: Format spapr-vio addresses as 32-bit

Using 8 hex digits all the time, regardless of whether the actual value can fit in fewer, makes it more obvious to the user what the limits are. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- src/conf/domain_conf.c | 2 +- tests/qemuargv2xmldata/nomachine-ppc64.xml | 2 +- tests/qemuargv2xmldata/pseries-disk.xml | 2 +- tests/qemuargv2xmldata/pseries-nvram.xml | 2 +- tests/qemuxml2xmloutdata/disk-scsi.xml | 2 +- tests/qemuxml2xmloutdata/pseries-nvram.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 97ba8bd53a..54a24b6276 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7135,7 +7135,7 @@ virDomainDeviceInfoFormat(virBufferPtr buf, case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO: if (info->addr.spaprvio.has_reg) - virBufferAsprintf(&attrBuf, " reg='0x%llx'", info->addr.spaprvio.reg); + virBufferAsprintf(&attrBuf, " reg='0x%08llx'", info->addr.spaprvio.reg); break; case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: diff --git a/tests/qemuargv2xmldata/nomachine-ppc64.xml b/tests/qemuargv2xmldata/nomachine-ppc64.xml index 18b0c5c20a..f61006efec 100644 --- a/tests/qemuargv2xmldata/nomachine-ppc64.xml +++ b/tests/qemuargv2xmldata/nomachine-ppc64.xml @@ -35,7 +35,7 @@ <target index='0'/> </controller> <controller type='scsi' index='0' model='ibmvscsi'> - <address type='spapr-vio' reg='0x2000'/> + <address type='spapr-vio' reg='0x00002000'/> </controller> <input type='keyboard' bus='usb'/> <input type='mouse' bus='usb'/> diff --git a/tests/qemuargv2xmldata/pseries-disk.xml b/tests/qemuargv2xmldata/pseries-disk.xml index 18b0c5c20a..f61006efec 100644 --- a/tests/qemuargv2xmldata/pseries-disk.xml +++ b/tests/qemuargv2xmldata/pseries-disk.xml @@ -35,7 +35,7 @@ <target index='0'/> </controller> <controller type='scsi' index='0' model='ibmvscsi'> - <address type='spapr-vio' reg='0x2000'/> + <address type='spapr-vio' reg='0x00002000'/> </controller> <input type='keyboard' bus='usb'/> <input type='mouse' bus='usb'/> diff --git a/tests/qemuargv2xmldata/pseries-nvram.xml b/tests/qemuargv2xmldata/pseries-nvram.xml index 500227afc0..78f79f17d7 100644 --- a/tests/qemuargv2xmldata/pseries-nvram.xml +++ b/tests/qemuargv2xmldata/pseries-nvram.xml @@ -23,7 +23,7 @@ </controller> <memballoon model='none'/> <nvram> - <address type='spapr-vio' reg='0x4000'/> + <address type='spapr-vio' reg='0x00004000'/> </nvram> <panic model='pseries'/> </devices> diff --git a/tests/qemuxml2xmloutdata/disk-scsi.xml b/tests/qemuxml2xmloutdata/disk-scsi.xml index 9cfff4b14e..45fed6423a 100644 --- a/tests/qemuxml2xmloutdata/disk-scsi.xml +++ b/tests/qemuxml2xmloutdata/disk-scsi.xml @@ -62,7 +62,7 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </controller> <controller type='scsi' index='3' model='ibmvscsi'> - <address type='spapr-vio' reg='0x2000'/> + <address type='spapr-vio' reg='0x00002000'/> </controller> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2xmloutdata/pseries-nvram.xml b/tests/qemuxml2xmloutdata/pseries-nvram.xml index f89b23b338..fd77c7aa89 100644 --- a/tests/qemuxml2xmloutdata/pseries-nvram.xml +++ b/tests/qemuxml2xmloutdata/pseries-nvram.xml @@ -23,7 +23,7 @@ </controller> <memballoon model='none'/> <nvram> - <address type='spapr-vio' reg='0x4000'/> + <address type='spapr-vio' reg='0x00004000'/> </nvram> <panic model='pseries'/> </devices> -- 2.21.0