tests: Add blkdeviotune-max xml2xmltest

It was missing... Also since I'm using the soft link from qemuxml2xmloutdata
to the qemuxml2argvdata file, modify the output file to have the necessary
<address> elements plus the mouse and keyboard.

Signed-off-by: John Ferlan <jferlan@redhat.com>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.xml
index 8b3e05c2e0d9ad6ff7f3fb973a4d4f25db9821dc..ac4a0c05a5adf09e4d919f59171d1f80e7696ff6 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.xml
@@ -43,9 +43,17 @@
       </iotune>
       <address type='drive' controller='0' bus='0' target='0' unit='1'/>
     </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-blkdeviotune-max.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max.xml
new file mode 120000 (symlink)
index 0000000..183e1f1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.xml
\ No newline at end of file

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index fb05c85714111648d88b44c97cf7dc1da4d44b39..4b5898694bf14942eb0e278aad7a5b6b29aeb30a 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -607,6 +607,7 @@ mymain(void)
     DO_TEST("usb-redir-filter", NONE);
     DO_TEST("usb-redir-filter-version", NONE);
     DO_TEST("blkdeviotune", NONE);
+    DO_TEST("blkdeviotune-max", NONE);
     DO_TEST("controller-usb-order", NONE);
 
     DO_TEST_FULL("seclabel-dynamic-baselabel", WHEN_INACTIVE, GIC_NONE, NONE);