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@redhat.com>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages4.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages4.xml
index 5e06e974576c423b47358b005cf849165ecae57e..13809e52b43a28ca3f9bd6db39b851567aaddefd 100644 (file)
--- 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 ceb93f7be8c2c50a0a136e2cdd25ac36614ea335..1e4ca64f85d87c1f97c2506a32cf5017923144c1 100644 (file)
--- 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 d978e041d288c4a88b9158476447749f41a779a0..ae8de680dd7edf67ec25d20a94fa251b7455f468 100644 (file)
--- 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 (symlink)
index 0000000..443e923
--- /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 (symlink)
index 0000000..31d50ae
--- /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 (symlink)
index 0000000..d81906b
--- /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 e2c747c72cc30efb68da3b615f03468c02ded870..c9ccaac5b3ea222fc2d2a5a5cf7f654fdfc5da98 100644 (file)
--- 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);