[libvirt] [PATCH 0/5] tests: qemuargv2xml: Enabling REGENERATE_OUTPUT
This reworks qemuargv2xml and lxcconf2xml tests to allow use of VIR_TEST_REGENERATE_OUTPUT Cole Robinson (5): tests: qemuargv2xml: Remove unneeded XML blanking tests: qemuargv2xml: Remove UUID randomness tests: qemuargv2xml: hardcode disk auth usage= tests: qemuargv2xml: Drop memory XML blanking tests: lxcconf2xml: Drop XML blanking tests/lxcconf2xmltest.c | 22 +++------ tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-boot-floppy.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-boot-network.xml | 4 +- .../qemuargv2xml-clock-localtime.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml | 4 +- .../qemuargv2xml-console-compat.xml | 4 +- .../qemuargv2xml-disk-cdrom-empty.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml | 4 +- .../qemuargv2xml-disk-drive-boot-cdrom.xml | 4 +- .../qemuargv2xml-disk-drive-boot-disk.xml | 4 +- .../qemuargv2xml-disk-drive-cache-v2-none.xml | 4 +- .../qemuargv2xml-disk-drive-network-iscsi-auth.xml | 2 +- .../qemuargv2xml-disk-drive-network-rbd-auth.xml | 2 +- .../qemuargv2xml-graphics-vnc-policy.xml | 4 +- .../qemuargv2xml-graphics-vnc-sasl.xml | 4 +- .../qemuargv2xml-graphics-vnc-socket.xml | 4 +- .../qemuargv2xml-graphics-vnc-tls.xml | 4 +- .../qemuargv2xml-graphics-vnc-websocket.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml | 4 +- .../qemuargv2xml-hostdev-pci-address.xml | 6 +-- .../qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-kvm-features.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml | 4 +- .../qemuargv2xml-machine-aeskeywrap-off-argv.xml | 4 +- .../qemuargv2xml-machine-aeskeywrap-on-argv.xml | 4 +- .../qemuargv2xml-machine-core-off.xml | 4 +- .../qemuargv2xml-machine-core-on.xml | 4 +- .../qemuargv2xml-machine-deakeywrap-off-argv.xml | 4 +- .../qemuargv2xml-machine-deakeywrap-on-argv.xml | 4 +- .../qemuargv2xml-machine-keywrap-none-argv.xml | 4 +- .../qemuargv2xml-misc-disable-s3.xml | 6 +-- .../qemuargv2xml-misc-disable-suspends.xml | 6 +-- .../qemuargv2xml-misc-enable-s4.xml | 6 +-- .../qemuargv2xml-misc-no-reboot.xml | 4 +- .../qemuargv2xml-net-eth-ifname.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-nosharepages.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 2 +- .../qemuargv2xml-pseries-nvram.xml | 2 +- .../qemuargv2xml-reboot-timeout-disabled.xml | 4 +- .../qemuargv2xml-reboot-timeout-enabled.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml | 4 +- .../qemuargv2xml-serial-tcp-telnet.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml | 4 +- tests/qemuargv2xmltest.c | 54 ++++++++++++---------- 50 files changed, 133 insertions(+), 135 deletions(-) -- 2.5.0
None of the test cases depend on dropping these XML bits --- tests/qemuargv2xmltest.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 6671be4..f07818a 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -23,14 +23,11 @@ static virQEMUDriver driver; static int blankProblemElements(char *data) { - if (virtTestClearLineRegex("<name>[[:alnum:]]+</name>", data) < 0 || - virtTestClearLineRegex("<uuid>([[:alnum:]]|-)+</uuid>", data) < 0 || + if (virtTestClearLineRegex("<uuid>([[:alnum:]]|-)+</uuid>", data) < 0 || virtTestClearLineRegex("<memory.*>[[:digit:]]+</memory>", data) < 0 || virtTestClearLineRegex("<secret.*>", data) < 0 || virtTestClearLineRegex("<currentMemory.*>[[:digit:]]+</currentMemory>", - data) < 0 || - virtTestClearLineRegex("<readonly/>", data) < 0 || - virtTestClearLineRegex("<shareable/>", data) < 0) + data) < 0) return -1; return 0; } -- 2.5.0
Overwrite any randomly generated UUID to use a hardcoded value, so we don't need to blank it when comparing XML. --- .../qemuargv2xml-hostdev-pci-address.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml | 2 +- .../qemuargv2xml-misc-disable-suspends.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-pseries-nvram.xml | 2 +- tests/qemuargv2xmltest.c | 19 +++++++++++++++++-- 7 files changed, 23 insertions(+), 8 deletions(-) diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.xml b/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.xml index 77b484d..937238a 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.xml @@ -1,6 +1,6 @@ <domain type='qemu'> <name>QEMUGuest2</name> - <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml b/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml index 3619c24..1545064 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml @@ -1,6 +1,6 @@ <domain type='qemu'> <name>QEMUGuest1</name> - <uuid>8caaa98c-e7bf-5845-126a-1fc316bd1089</uuid> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.xml b/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.xml index 30276e0..f6ebba9 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.xml @@ -1,6 +1,6 @@ <domain type='qemu'> <name>QEMUGuest1</name> - <uuid>8caaa98c-e7bf-5845-126a-1fc316bd1089</uuid> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml b/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml index ac8b3f0..089622c 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml @@ -1,6 +1,6 @@ <domain type='qemu'> <name>QEMUGuest1</name> - <uuid>8caaa98c-e7bf-5845-126a-1fc316bd1089</uuid> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static'>1</vcpu> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml b/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml index 39f4a1f..44c3b1d 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml @@ -1,6 +1,6 @@ <domain type='qemu'> <name>QEMUGuest1</name> - <uuid>87eedafe-eedc-4336-8130-ed9fe5dc90c8</uuid> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>524288</memory> <currentMemory unit='KiB'>524288</currentMemory> <vcpu placement='static'>1</vcpu> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-pseries-nvram.xml b/tests/qemuargv2xmldata/qemuargv2xml-pseries-nvram.xml index 2da2832..eafe49d 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-pseries-nvram.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-pseries-nvram.xml @@ -1,6 +1,6 @@ <domain type='qemu'> <name>QEMUGuest1</name> - <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>524288</memory> <currentMemory unit='KiB'>524288</currentMemory> <vcpu placement='static'>1</vcpu> diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index f07818a..6650cf0 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -23,8 +23,7 @@ static virQEMUDriver driver; static int blankProblemElements(char *data) { - if (virtTestClearLineRegex("<uuid>([[:alnum:]]|-)+</uuid>", data) < 0 || - virtTestClearLineRegex("<memory.*>[[:digit:]]+</memory>", data) < 0 || + if (virtTestClearLineRegex("<memory.*>[[:digit:]]+</memory>", data) < 0 || virtTestClearLineRegex("<secret.*>", data) < 0 || virtTestClearLineRegex("<currentMemory.*>[[:digit:]]+</currentMemory>", data) < 0) @@ -32,6 +31,19 @@ static int blankProblemElements(char *data) return 0; } +static int testSanitizeDef(virDomainDefPtr vmdef) +{ + int ret = -1; + + /* Remove UUID randomness */ + if (virUUIDParse("c7a5fdbd-edaf-9455-926a-d65c16db1809", vmdef->uuid) < 0) + goto fail; + + ret = 0; + fail: + return ret; +} + typedef enum { FLAG_EXPECT_WARNING = 1 << 0, } virQemuXML2ArgvTestFlags; @@ -79,6 +91,9 @@ static int testCompareXMLToArgvFiles(const char *xml, } } + if (testSanitizeDef(vmdef) < 0) + goto fail; + if (!virDomainDefCheckABIStability(vmdef, vmdef)) { VIR_TEST_DEBUG("ABI stability check failed on %s", xml); goto fail; -- 2.5.0
If a qemuargv has iscsi or ceph secrets on the command line, we will convert that to XML like: <auth username='myname'> <secret type='iscsi'/> </auth> This is not valid XML, as either a UUID or usage must be specified in the secret block. It's not clear though how the argv2xml code can do anything correct here, since XML like this requires a libvirt secret object to have already been defined. The current test suite handles this by blanking out any <secret> block in the XML. This avoids domainschematest failures. Instead of blanking, let's hardcode a usage= name. This lets us test the other bits of generated <secret> XML, and is a step towards wiring up VIR_TEST_REGENERATE_OUTPUT --- .../qemuargv2xml-disk-drive-network-iscsi-auth.xml | 2 +- .../qemuargv2xml-disk-drive-network-rbd-auth.xml | 2 +- tests/qemuargv2xmltest.c | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml index 5ac4abf..35b3abc 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml @@ -17,7 +17,7 @@ <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <auth username='myname'> - <secret type='iscsi' usage='mycluster_myname'/> + <secret type='iscsi' usage='qemuargv2xml_usage'/> </auth> <source protocol='iscsi' name='iqn.1992-01.com.example'> <host name='example.org' port='6000'/> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml index ac2e942..4db031b 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml @@ -23,7 +23,7 @@ <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <auth username='myname'> - <secret type='ceph' usage='mycluster_myname'/> + <secret type='ceph' usage='qemuargv2xml_usage'/> </auth> <source protocol='rbd' name='pool/image'> <host name='mon1.example.org' port='6321'/> diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 6650cf0..8e0e711 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -24,7 +24,6 @@ static virQEMUDriver driver; static int blankProblemElements(char *data) { if (virtTestClearLineRegex("<memory.*>[[:digit:]]+</memory>", data) < 0 || - virtTestClearLineRegex("<secret.*>", data) < 0 || virtTestClearLineRegex("<currentMemory.*>[[:digit:]]+</currentMemory>", data) < 0) return -1; @@ -33,12 +32,26 @@ static int blankProblemElements(char *data) static int testSanitizeDef(virDomainDefPtr vmdef) { + size_t i = 0; int ret = -1; /* Remove UUID randomness */ if (virUUIDParse("c7a5fdbd-edaf-9455-926a-d65c16db1809", vmdef->uuid) < 0) goto fail; + /* qemuargv2xml doesn't know what to set for a secret usage/uuid, + * so hardcode usage='qemuargv2xml_usage' to appead the schema checker */ + for (i = 0; i < vmdef->ndisks; i++) { + virDomainDiskDefPtr disk = vmdef->disks[i]; + + if (disk->src->auth) { + disk->src->auth->secretType = VIR_STORAGE_SECRET_TYPE_USAGE; + if (VIR_STRDUP(disk->src->auth->secret.usage, + "qemuargv2xml_usage") < 0) + goto fail; + } + } + ret = 0; fail: return ret; -- 2.5.0
The memory XML blanking is only there to avoid the unit= churn that was added by default a long time ago. Drop the blanking, switch over to using the standard comparison helpers, and regenerate the output with VIR_TEST_REGENERATE_OUTPUT. --- tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml | 4 ++-- .../qemuargv2xmldata/qemuargv2xml-boot-floppy.xml | 4 ++-- .../qemuargv2xmldata/qemuargv2xml-boot-network.xml | 4 ++-- .../qemuargv2xml-clock-localtime.xml | 4 ++-- tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml | 4 ++-- .../qemuargv2xml-console-compat.xml | 4 ++-- .../qemuargv2xml-disk-cdrom-empty.xml | 4 ++-- tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml | 4 ++-- .../qemuargv2xml-disk-drive-boot-cdrom.xml | 4 ++-- .../qemuargv2xml-disk-drive-boot-disk.xml | 4 ++-- .../qemuargv2xml-disk-drive-cache-v2-none.xml | 4 ++-- .../qemuargv2xml-graphics-vnc-policy.xml | 4 ++-- .../qemuargv2xml-graphics-vnc-sasl.xml | 4 ++-- .../qemuargv2xml-graphics-vnc-socket.xml | 4 ++-- .../qemuargv2xml-graphics-vnc-tls.xml | 4 ++-- .../qemuargv2xml-graphics-vnc-websocket.xml | 4 ++-- .../qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml | 4 ++-- .../qemuargv2xml-hostdev-pci-address.xml | 4 ++-- .../qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml | 4 ++-- tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml | 4 ++-- .../qemuargv2xmldata/qemuargv2xml-kvm-features.xml | 4 ++-- tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml | 4 ++-- .../qemuargv2xml-machine-aeskeywrap-off-argv.xml | 4 ++-- .../qemuargv2xml-machine-aeskeywrap-on-argv.xml | 4 ++-- .../qemuargv2xml-machine-core-off.xml | 4 ++-- .../qemuargv2xml-machine-core-on.xml | 4 ++-- .../qemuargv2xml-machine-deakeywrap-off-argv.xml | 4 ++-- .../qemuargv2xml-machine-deakeywrap-on-argv.xml | 4 ++-- .../qemuargv2xml-machine-keywrap-none-argv.xml | 4 ++-- .../qemuargv2xml-misc-disable-s3.xml | 4 ++-- .../qemuargv2xml-misc-disable-suspends.xml | 4 ++-- .../qemuargv2xml-misc-enable-s4.xml | 4 ++-- .../qemuargv2xml-misc-no-reboot.xml | 4 ++-- .../qemuargv2xml-net-eth-ifname.xml | 4 ++-- tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml | 4 ++-- .../qemuargv2xmldata/qemuargv2xml-nosharepages.xml | 4 ++-- .../qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml | 4 ++-- .../qemuargv2xml-reboot-timeout-disabled.xml | 4 ++-- .../qemuargv2xml-reboot-timeout-enabled.xml | 4 ++-- tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml | 4 ++-- .../qemuargv2xml-serial-tcp-telnet.xml | 4 ++-- tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml | 4 ++-- tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml | 4 ++-- tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml | 4 ++-- tests/qemuargv2xmltest.c | 25 +++------------------- 45 files changed, 91 insertions(+), 110 deletions(-) diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml b/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml index 9c0e667..31afdc5 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml b/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml index 390bc67..13137c5 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml b/tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml index ad421da..cc0607d 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml b/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml index 642d276..b55515a 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml b/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml index 9da4df0..23fc792 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml b/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml index 3eaeffa..7be7259 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml index 705c493..5b47754 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml index 04f4976..647a4d0 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml index 80a6978..e4d78ec 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml index 809eb80..2202eba 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml index 2ee3118..69f3f1c 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml index 1c76ddc..46f06a8 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml index e350142..a856edc 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml index de70bc4..8fe4133 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml index e350142..a856edc 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml index afa4b5a..25e3bad 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml index 3313469..256c9b5 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.xml b/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.xml index 937238a..c898523 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest2</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml b/tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml index 0cafc07..e549e05 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>6</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml b/tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml index 2b8f332..5a19af0 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>6</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-kvm-features.xml b/tests/qemuargv2xmldata/qemuargv2xml-kvm-features.xml index 8837596..840e3e2 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-kvm-features.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-kvm-features.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>6</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml b/tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml index 15b474b..ae8ccc9 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml @@ -1,8 +1,8 @@ <domain type='kvm'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>6</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml index 0975d4a..1658e12 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml index 8aa8f8e..3d676aa 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.xml index be84ca4..394880d 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory dumpCore='off' unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory dumpCore='off' unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.xml index 58784ba..26183bb 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory dumpCore='on' unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory dumpCore='on' unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml index 90b6d9f..f3bc8af 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml index 76a6a51..1e0660f 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml index 0a963a1..6acee07 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml b/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml index 1545064..2efe9ea 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.xml b/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.xml index f6ebba9..5c77957 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml b/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml index 089622c..a765cae 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.xml b/tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.xml index 6dba315..0a7299f 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml index d1810b5..7527c60 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml index 5e88efb..ee72830 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nosharepages.xml b/tests/qemuargv2xmldata/qemuargv2xml-nosharepages.xml index 021642a..ebb84ab 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-nosharepages.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-nosharepages.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219200</memory> - <currentMemory unit='KiB'>219200</currentMemory> + <memory unit='KiB'>220160</memory> + <currentMemory unit='KiB'>220160</currentMemory> <memoryBacking> <nosharepages/> </memoryBacking> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml b/tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml index 99d2110..b2fa9f2 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.xml b/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.xml index 8fa2a7e..29ddd9f 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>6</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.xml b/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.xml index 92707f4..1d7f6f1 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>6</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml index aa03ab8..e44528d 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml index 48037bb..5cde307 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml index ba0c289..2a43184 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml index 69ce1ba..7cded6f 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml b/tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml index eb7ed99..aac3e72 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 8e0e711..48c83ea 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -21,15 +21,6 @@ static virQEMUDriver driver; -static int blankProblemElements(char *data) -{ - if (virtTestClearLineRegex("<memory.*>[[:digit:]]+</memory>", data) < 0 || - virtTestClearLineRegex("<currentMemory.*>[[:digit:]]+</currentMemory>", - data) < 0) - return -1; - return 0; -} - static int testSanitizeDef(virDomainDefPtr vmdef) { size_t i = 0; @@ -61,11 +52,10 @@ typedef enum { FLAG_EXPECT_WARNING = 1 << 0, } virQemuXML2ArgvTestFlags; -static int testCompareXMLToArgvFiles(const char *xml, +static int testCompareXMLToArgvFiles(const char *xmlfile, const char *cmdfile, virQemuXML2ArgvTestFlags flags) { - char *expectxml = NULL; char *actualxml = NULL; char *cmd = NULL; char *log = NULL; @@ -74,8 +64,6 @@ static int testCompareXMLToArgvFiles(const char *xml, if (virtTestLoadFile(cmdfile, &cmd) < 0) goto fail; - if (virtTestLoadFile(xml, &expectxml) < 0) - goto fail; if (!(vmdef = qemuParseCommandLineString(driver.caps, driver.xmlopt, cmd, NULL, NULL, NULL))) @@ -108,26 +96,19 @@ static int testCompareXMLToArgvFiles(const char *xml, goto fail; if (!virDomainDefCheckABIStability(vmdef, vmdef)) { - VIR_TEST_DEBUG("ABI stability check failed on %s", xml); + VIR_TEST_DEBUG("ABI stability check failed on %s", xmlfile); goto fail; } if (!(actualxml = virDomainDefFormat(vmdef, driver.caps, 0))) goto fail; - if (blankProblemElements(expectxml) < 0 || - blankProblemElements(actualxml) < 0) + if (virtTestCompareToFile(actualxml, xmlfile) < 0) goto fail; - if (STRNEQ(expectxml, actualxml)) { - virtTestDifference(stderr, expectxml, actualxml); - goto fail; - } - ret = 0; fail: - VIR_FREE(expectxml); VIR_FREE(actualxml); VIR_FREE(cmd); VIR_FREE(log); -- 2.5.0
Hardcode a UUID like we did for qemuargv2xml, so we can use standard comparison helpers, which gives us VIR_TEST_REGENERATE_OUTPUT support --- tests/lxcconf2xmltest.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/tests/lxcconf2xmltest.c b/tests/lxcconf2xmltest.c index fc071f7..83895cd 100644 --- a/tests/lxcconf2xmltest.c +++ b/tests/lxcconf2xmltest.c @@ -13,22 +13,21 @@ static virCapsPtr caps; static virDomainXMLOptionPtr xmlopt; -static int -blankProblemElements(char *data) +static int testSanitizeDef(virDomainDefPtr vmdef) { - if (virtTestClearLineRegex("<uuid>([[:alnum:]]|-)+</uuid>", data) < 0) + /* Remove UUID randomness */ + if (virUUIDParse("c7a5fdbd-edaf-9455-926a-d65c16db1809", vmdef->uuid) < 0) return -1; return 0; } static int -testCompareXMLToConfigFiles(const char *xml, +testCompareXMLToConfigFiles(const char *xmlfile, const char *configfile, bool expectError) { int ret = -1; char *config = NULL; - char *expectxml = NULL; char *actualxml = NULL; virDomainDefPtr vmdef = NULL; @@ -40,26 +39,19 @@ testCompareXMLToConfigFiles(const char *xml, goto fail; if (vmdef) { - if (!(actualxml = virDomainDefFormat(vmdef, caps, 0))) + if (testSanitizeDef(vmdef) < 0) goto fail; - if (virtTestLoadFile(xml, &expectxml) < 0) - goto fail; - - if (blankProblemElements(expectxml) < 0 || - blankProblemElements(actualxml) < 0) + if (!(actualxml = virDomainDefFormat(vmdef, caps, 0))) goto fail; - if (STRNEQ(expectxml, actualxml)) { - virtTestDifferenceFull(stderr, expectxml, xml, actualxml, NULL); + if (virtTestCompareToFile(actualxml, xmlfile) < 0) goto fail; - } } ret = 0; fail: - VIR_FREE(expectxml); VIR_FREE(actualxml); VIR_FREE(config); virDomainDefFree(vmdef); -- 2.5.0
This was only used for test 'xml blanking', which has now all been removed, and isn't an ideal paradigm anyways since it inhibits easy XML regeneration. --- tests/testutils.c | 45 --------------------------------------------- tests/testutils.h | 3 --- 2 files changed, 48 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index c4f1616..c1ca656 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -942,51 +942,6 @@ int virtTestMain(int argc, } -int virtTestClearLineRegex(const char *pattern, - char *str) -{ - regex_t reg; - char *lineStart = str; - char *lineEnd = strchr(str, '\n'); - - if (regcomp(®, pattern, REG_EXTENDED | REG_NOSUB) != 0) - return -1; - - while (lineStart) { - int ret; - if (lineEnd) - *lineEnd = '\0'; - - - ret = regexec(®, lineStart, 0, NULL, 0); - //fprintf(stderr, "Match %d '%s' '%s'\n", ret, lineStart, pattern); - if (ret == 0) { - if (lineEnd) { - memmove(lineStart, lineEnd + 1, strlen(lineEnd+1) + 1); - /* Don't update lineStart - just iterate again on this - location */ - lineEnd = strchr(lineStart, '\n'); - } else { - *lineStart = '\0'; - lineStart = NULL; - } - } else { - if (lineEnd) { - *lineEnd = '\n'; - lineStart = lineEnd + 1; - lineEnd = strchr(lineStart, '\n'); - } else { - lineStart = NULL; - } - } - } - - regfree(®); - - return 0; -} - - /* * @cmdset contains a list of command line args, eg * diff --git a/tests/testutils.h b/tests/testutils.h index df2b2a6..bb58148 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -54,9 +54,6 @@ int virtTestRun(const char *title, int virtTestLoadFile(const char *file, char **buf); int virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen); -int virtTestClearLineRegex(const char *pattern, - char *string); - void virtTestClearCommandPath(char *cmdset); int virtTestDifference(FILE *stream, -- 2.5.0
On 02/16/2016 12:44 PM, Cole Robinson wrote:
This reworks qemuargv2xml and lxcconf2xml tests to allow use of VIR_TEST_REGENERATE_OUTPUT
Cole Robinson (5): tests: qemuargv2xml: Remove unneeded XML blanking tests: qemuargv2xml: Remove UUID randomness tests: qemuargv2xml: hardcode disk auth usage= tests: qemuargv2xml: Drop memory XML blanking tests: lxcconf2xml: Drop XML blanking
tests/lxcconf2xmltest.c | 22 +++------ tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-boot-floppy.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-boot-network.xml | 4 +- .../qemuargv2xml-clock-localtime.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml | 4 +- .../qemuargv2xml-console-compat.xml | 4 +- .../qemuargv2xml-disk-cdrom-empty.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml | 4 +- .../qemuargv2xml-disk-drive-boot-cdrom.xml | 4 +- .../qemuargv2xml-disk-drive-boot-disk.xml | 4 +- .../qemuargv2xml-disk-drive-cache-v2-none.xml | 4 +- .../qemuargv2xml-disk-drive-network-iscsi-auth.xml | 2 +- .../qemuargv2xml-disk-drive-network-rbd-auth.xml | 2 +- .../qemuargv2xml-graphics-vnc-policy.xml | 4 +- .../qemuargv2xml-graphics-vnc-sasl.xml | 4 +- .../qemuargv2xml-graphics-vnc-socket.xml | 4 +- .../qemuargv2xml-graphics-vnc-tls.xml | 4 +- .../qemuargv2xml-graphics-vnc-websocket.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml | 4 +- .../qemuargv2xml-hostdev-pci-address.xml | 6 +-- .../qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-kvm-features.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml | 4 +- .../qemuargv2xml-machine-aeskeywrap-off-argv.xml | 4 +- .../qemuargv2xml-machine-aeskeywrap-on-argv.xml | 4 +- .../qemuargv2xml-machine-core-off.xml | 4 +- .../qemuargv2xml-machine-core-on.xml | 4 +- .../qemuargv2xml-machine-deakeywrap-off-argv.xml | 4 +- .../qemuargv2xml-machine-deakeywrap-on-argv.xml | 4 +- .../qemuargv2xml-machine-keywrap-none-argv.xml | 4 +- .../qemuargv2xml-misc-disable-s3.xml | 6 +-- .../qemuargv2xml-misc-disable-suspends.xml | 6 +-- .../qemuargv2xml-misc-enable-s4.xml | 6 +-- .../qemuargv2xml-misc-no-reboot.xml | 4 +- .../qemuargv2xml-net-eth-ifname.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-nosharepages.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 2 +- .../qemuargv2xml-pseries-nvram.xml | 2 +- .../qemuargv2xml-reboot-timeout-disabled.xml | 4 +- .../qemuargv2xml-reboot-timeout-enabled.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml | 4 +- .../qemuargv2xml-serial-tcp-telnet.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml | 4 +- tests/qemuargv2xmltest.c | 54 ++++++++++++---------- 50 files changed, 133 insertions(+), 135 deletions(-)
These all seem reasonable to me - ACK John
On 02/17/2016 10:58 AM, John Ferlan wrote:
On 02/16/2016 12:44 PM, Cole Robinson wrote:
This reworks qemuargv2xml and lxcconf2xml tests to allow use of VIR_TEST_REGENERATE_OUTPUT
Cole Robinson (5): tests: qemuargv2xml: Remove unneeded XML blanking tests: qemuargv2xml: Remove UUID randomness tests: qemuargv2xml: hardcode disk auth usage= tests: qemuargv2xml: Drop memory XML blanking tests: lxcconf2xml: Drop XML blanking
tests/lxcconf2xmltest.c | 22 +++------ tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-boot-floppy.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-boot-network.xml | 4 +- .../qemuargv2xml-clock-localtime.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml | 4 +- .../qemuargv2xml-console-compat.xml | 4 +- .../qemuargv2xml-disk-cdrom-empty.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml | 4 +- .../qemuargv2xml-disk-drive-boot-cdrom.xml | 4 +- .../qemuargv2xml-disk-drive-boot-disk.xml | 4 +- .../qemuargv2xml-disk-drive-cache-v2-none.xml | 4 +- .../qemuargv2xml-disk-drive-network-iscsi-auth.xml | 2 +- .../qemuargv2xml-disk-drive-network-rbd-auth.xml | 2 +- .../qemuargv2xml-graphics-vnc-policy.xml | 4 +- .../qemuargv2xml-graphics-vnc-sasl.xml | 4 +- .../qemuargv2xml-graphics-vnc-socket.xml | 4 +- .../qemuargv2xml-graphics-vnc-tls.xml | 4 +- .../qemuargv2xml-graphics-vnc-websocket.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml | 4 +- .../qemuargv2xml-hostdev-pci-address.xml | 6 +-- .../qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-kvm-features.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml | 4 +- .../qemuargv2xml-machine-aeskeywrap-off-argv.xml | 4 +- .../qemuargv2xml-machine-aeskeywrap-on-argv.xml | 4 +- .../qemuargv2xml-machine-core-off.xml | 4 +- .../qemuargv2xml-machine-core-on.xml | 4 +- .../qemuargv2xml-machine-deakeywrap-off-argv.xml | 4 +- .../qemuargv2xml-machine-deakeywrap-on-argv.xml | 4 +- .../qemuargv2xml-machine-keywrap-none-argv.xml | 4 +- .../qemuargv2xml-misc-disable-s3.xml | 6 +-- .../qemuargv2xml-misc-disable-suspends.xml | 6 +-- .../qemuargv2xml-misc-enable-s4.xml | 6 +-- .../qemuargv2xml-misc-no-reboot.xml | 4 +- .../qemuargv2xml-net-eth-ifname.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-nosharepages.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 2 +- .../qemuargv2xml-pseries-nvram.xml | 2 +- .../qemuargv2xml-reboot-timeout-disabled.xml | 4 +- .../qemuargv2xml-reboot-timeout-enabled.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml | 4 +- .../qemuargv2xml-serial-tcp-telnet.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml | 4 +- tests/qemuargv2xmltest.c | 54 ++++++++++++---------- 50 files changed, 133 insertions(+), 135 deletions(-)
These all seem reasonable to me - ACK
John
Thanks! pushed now - Cole
participants (2)
-
Cole Robinson -
John Ferlan