[libvirt] [PATCH 1/3] qemuxml2xmltest: Test hugepage enabled domains

We have couple of hugepage enabled domains for qemuxml2argvtest. Unfortunately, often when adding a test case there I forget to add it to xml2xml test too. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages4.xml | 14 +++++++++++--- tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.xml | 14 +++++++++++--- tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.xml | 14 +++++++++++--- .../qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml | 1 + .../qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml | 1 + .../qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml | 1 + tests/qemuxml2xmltest.c | 3 +++ 7 files changed, 39 insertions(+), 9 deletions(-) create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages4.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages4.xml index 5e06e9745..13809e52b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages4.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages4.xml @@ -37,9 +37,17 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> <controller type='pci' index='0' model='pci-root'/> - <memballoon model='virtio'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> </devices> </domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.xml index ceb93f7be..1e4ca64f8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.xml @@ -24,9 +24,17 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> <controller type='pci' index='0' model='pci-root'/> - <memballoon model='virtio'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> </devices> </domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.xml index d978e041d..ae8de680d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.xml @@ -24,9 +24,17 @@ <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> <controller type='pci' index='0' model='pci-root'/> - <memballoon model='virtio'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> </devices> </domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml new file mode 120000 index 000000000..443e923b2 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/qemuxml2argv-hugepages-pages4.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml new file mode 120000 index 000000000..31d50ae79 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/qemuxml2argv-hugepages-pages5.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml new file mode 120000 index 000000000..d81906b88 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/qemuxml2argv-hugepages-pages6.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index e2c747c72..c9ccaac5b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -415,6 +415,9 @@ mymain(void) DO_TEST("hugepages-pages", NONE); DO_TEST("hugepages-pages2", NONE); DO_TEST("hugepages-pages3", NONE); + DO_TEST("hugepages-pages4", NONE); + DO_TEST("hugepages-pages5", NONE); + DO_TEST("hugepages-pages6", NONE); DO_TEST("hugepages-shared", NONE); DO_TEST("nosharepages", NONE); DO_TEST("restore-v2", NONE); -- 2.13.0