[PATCH 05/21] qemuxml2xmltest: Modernize iothread CWW/SCSI test cases

[Peter Krempa]

The argv counterparts are already modernized.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 ...ccw.xml => iothreads-disk-virtio-ccw.s390x-latest.xml} | 4 ++++
 ...ccw.xml => iothreads-virtio-scsi-ccw.s390x-latest.xml} | 4 ++++
 ...ci.xml => iothreads-virtio-scsi-pci.x86_64-latest.xml} | 5 ++++-
 tests/qemuxml2xmltest.c                                   | 8 +++-----
 4 files changed, 15 insertions(+), 6 deletions(-)
 rename tests/qemuxml2xmloutdata/{iothreads-disk-virtio-ccw.xml => iothreads-disk-virtio-ccw.s390x-latest.xml} (89%)
 rename tests/qemuxml2xmloutdata/{iothreads-virtio-scsi-ccw.xml => iothreads-virtio-scsi-ccw.s390x-latest.xml} (90%)
 rename tests/qemuxml2xmloutdata/{iothreads-virtio-scsi-pci.xml => iothreads-virtio-scsi-pci.x86_64-latest.xml} (92%)

diff --git a/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml b/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.s390x-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml
rename to tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.s390x-latest.xml
index 05cb204ea5..cdcee3bbb4 100644
--- a/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.s390x-latest.xml
@@ -9,6 +9,9 @@
     <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -28,6 +31,7 @@
       <address type='ccw' cssid='0x0' ssid='0x0' devno='0x0007'/>
     </disk>
     <controller type='usb' index='0' model='none'/>
+    <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x000a'/>
diff --git a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.s390x-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml
rename to tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.s390x-latest.xml
index 11fead6c8b..d73f43f235 100644
--- a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.s390x-latest.xml
@@ -9,6 +9,9 @@
     <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -32,6 +35,7 @@
       <driver iothread='2'/>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
     </controller>
+    <controller type='pci' index='0' model='pci-root'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x000a'/>
diff --git a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml
rename to tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.x86_64-latest.xml
index b2c66ba9b8..5418a38a39 100644
--- a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.x86_64-latest.xml
@@ -9,6 +9,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -33,7 +36,7 @@
       <target dev='sdc' bus='scsi'/>
       <address type='drive' controller='0' bus='0' target='0' unit='3'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 4d9c6853a7..ef71df7b3f 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -587,11 +587,9 @@ mymain(void)
     DO_TEST_CAPS_LATEST("iothreads-ids-partial");
     DO_TEST_NOCAPS("cputune-iothreads");
     DO_TEST_CAPS_LATEST("iothreads-disk");
-    DO_TEST_NOCAPS("iothreads-disk-virtio-ccw");
-    DO_TEST("iothreads-virtio-scsi-pci",
-            QEMU_CAPS_VIRTIO_SCSI);
-    DO_TEST("iothreads-virtio-scsi-ccw",
-            QEMU_CAPS_VIRTIO_SCSI);
+    DO_TEST_CAPS_ARCH_LATEST("iothreads-disk-virtio-ccw", "s390x");
+    DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci");
+    DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x");
     DO_TEST_NOCAPS("lease");
     DO_TEST_NOCAPS("event_idx");
     DO_TEST_NOCAPS("vhost_queues");
-- 
2.39.2