From c5ee3a0a706d5e302ab1783fde6dc34f7b6aadfe Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 16 Aug 2023 14:52:34 +0200
Subject: [PATCH] qemuxml2xmltest: Modernize all 'video-*' cases
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 .../qemuxml2argvdata/video-qxl-resolution.xml |  5 ++-
 ...-device-pciaddr-default.x86_64-latest.xml} |  5 ++-
 ...ml => video-none-device.x86_64-latest.xml} |  5 ++-
 ....xml => video-qxl-heads.x86_64-latest.xml} |  5 ++-
 ...ml => video-qxl-noheads.x86_64-latest.xml} |  5 ++-
 ...=> video-qxl-resolution.x86_64-latest.xml} |  0
 ...video-virtio-gpu-device.x86_64-latest.xml} |  5 ++-
 ...video-virtio-gpu-sdl-gl.x86_64-latest.xml} |  5 ++-
 ...eo-virtio-gpu-secondary.x86_64-latest.xml} |  5 ++-
 ...deo-virtio-gpu-spice-gl.x86_64-latest.xml} |  5 ++-
 ... video-virtio-gpu-virgl.x86_64-latest.xml} |  5 ++-
 tests/qemuxml2xmltest.c                       | 33 ++++++-------------
 12 files changed, 50 insertions(+), 33 deletions(-)
 rename tests/qemuxml2xmloutdata/{video-device-pciaddr-default.xml => video-device-pciaddr-default.x86_64-latest.xml} (92%)
 rename tests/qemuxml2xmloutdata/{video-none-device.xml => video-none-device.x86_64-latest.xml} (90%)
 rename tests/qemuxml2xmloutdata/{video-qxl-heads.xml => video-qxl-heads.x86_64-latest.xml} (92%)
 rename tests/qemuxml2xmloutdata/{video-qxl-noheads.xml => video-qxl-noheads.x86_64-latest.xml} (90%)
 rename tests/qemuxml2xmloutdata/{video-qxl-resolution.xml => video-qxl-resolution.x86_64-latest.xml} (100%)
 rename tests/qemuxml2xmloutdata/{video-virtio-gpu-device.xml => video-virtio-gpu-device.x86_64-latest.xml} (90%)
 rename tests/qemuxml2xmloutdata/{video-virtio-gpu-sdl-gl.xml => video-virtio-gpu-sdl-gl.x86_64-latest.xml} (90%)
 rename tests/qemuxml2xmloutdata/{video-virtio-gpu-secondary.xml => video-virtio-gpu-secondary.x86_64-latest.xml} (88%)
 rename tests/qemuxml2xmloutdata/{video-virtio-gpu-spice-gl.xml => video-virtio-gpu-spice-gl.x86_64-latest.xml} (91%)
 rename tests/qemuxml2xmloutdata/{video-virtio-gpu-virgl.xml => video-virtio-gpu-virgl.x86_64-latest.xml} (90%)

diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.xml b/tests/qemuxml2argvdata/video-qxl-resolution.xml
index 5715f9daa4..f0f8f76a99 100644
--- a/tests/qemuxml2argvdata/video-qxl-resolution.xml
+++ b/tests/qemuxml2argvdata/video-qxl-resolution.xml
@@ -8,6 +8,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>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </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/qemuxml2xmloutdata/video-device-pciaddr-default.xml b/tests/qemuxml2xmloutdata/video-device-pciaddr-default.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml
rename to tests/qemuxml2xmloutdata/video-device-pciaddr-default.x86_64-latest.xml
index 431661e29d..1d71995af0 100644
--- a/tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml
+++ b/tests/qemuxml2xmloutdata/video-device-pciaddr-default.x86_64-latest.xml
@@ -8,6 +8,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>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </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/qemuxml2xmloutdata/video-none-device.xml b/tests/qemuxml2xmloutdata/video-none-device.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/video-none-device.xml
rename to tests/qemuxml2xmloutdata/video-none-device.x86_64-latest.xml
index 1c6c417bc8..e39c617b91 100644
--- a/tests/qemuxml2xmloutdata/video-none-device.xml
+++ b/tests/qemuxml2xmloutdata/video-none-device.x86_64-latest.xml
@@ -8,6 +8,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>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </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/qemuxml2xmloutdata/video-qxl-heads.xml b/tests/qemuxml2xmloutdata/video-qxl-heads.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/video-qxl-heads.xml
rename to tests/qemuxml2xmloutdata/video-qxl-heads.x86_64-latest.xml
index 9a8e1fca0b..6d93ba1330 100644
--- a/tests/qemuxml2xmloutdata/video-qxl-heads.xml
+++ b/tests/qemuxml2xmloutdata/video-qxl-heads.x86_64-latest.xml
@@ -8,6 +8,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>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </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/qemuxml2xmloutdata/video-qxl-noheads.xml b/tests/qemuxml2xmloutdata/video-qxl-noheads.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/video-qxl-noheads.xml
rename to tests/qemuxml2xmloutdata/video-qxl-noheads.x86_64-latest.xml
index 6243e29075..39d2f83422 100644
--- a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
+++ b/tests/qemuxml2xmloutdata/video-qxl-noheads.x86_64-latest.xml
@@ -8,6 +8,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>
@@ -20,7 +23,7 @@
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </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/qemuxml2xmloutdata/video-qxl-resolution.xml b/tests/qemuxml2xmloutdata/video-qxl-resolution.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/video-qxl-resolution.xml
rename to tests/qemuxml2xmloutdata/video-qxl-resolution.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-device.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-device.x86_64-latest.xml
index c1fc9c7f67..0c31cfb927 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-device.x86_64-latest.xml
@@ -8,6 +8,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>
@@ -23,7 +26,7 @@
     <controller type='ide' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <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='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.x86_64-latest.xml
index 5a233f527c..401fdaf697 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.x86_64-latest.xml
@@ -8,6 +8,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>
@@ -23,7 +26,7 @@
     <controller type='ide' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <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='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.x86_64-latest.xml
index 413296a925..7eae993cc0 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.x86_64-latest.xml
@@ -8,6 +8,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>
@@ -15,7 +18,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type='pci' index='0' model='pci-root'/>
-    <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>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.x86_64-latest.xml
index 411462bebf..89da83de01 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.x86_64-latest.xml
@@ -8,6 +8,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>
@@ -23,7 +26,7 @@
     <controller type='ide' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <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='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
rename to tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.x86_64-latest.xml
index d26ada53a3..48b1d833ff 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.x86_64-latest.xml
@@ -8,6 +8,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>
@@ -23,7 +26,7 @@
     <controller type='ide' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
-    <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='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 4cc411eba4..49cd2310df 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1018,20 +1018,10 @@ mymain(void)
 
     DO_TEST_CAPS_LATEST("net-udp");
 
-    DO_TEST("video-virtio-gpu-device", QEMU_CAPS_DEVICE_VIRTIO_GPU);
-    DO_TEST("video-virtio-gpu-virgl",
-            QEMU_CAPS_DEVICE_VIRTIO_GPU,
-            QEMU_CAPS_VIRTIO_GPU_VIRGL);
-    DO_TEST("video-virtio-gpu-spice-gl",
-            QEMU_CAPS_DEVICE_VIRTIO_GPU,
-            QEMU_CAPS_VIRTIO_GPU_VIRGL,
-            QEMU_CAPS_SPICE,
-            QEMU_CAPS_SPICE_GL,
-            QEMU_CAPS_SPICE_RENDERNODE);
-    DO_TEST("video-virtio-gpu-sdl-gl",
-            QEMU_CAPS_DEVICE_VIRTIO_GPU,
-            QEMU_CAPS_VIRTIO_GPU_VIRGL,
-            QEMU_CAPS_SDL);
+    DO_TEST_CAPS_LATEST("video-virtio-gpu-device");
+    DO_TEST_CAPS_LATEST("video-virtio-gpu-virgl");
+    DO_TEST_CAPS_LATEST("video-virtio-gpu-spice-gl");
+    DO_TEST_CAPS_LATEST("video-virtio-gpu-sdl-gl");
 
     DO_TEST("virtio-input",
             QEMU_CAPS_VIRTIO_KEYBOARD,
@@ -1059,17 +1049,14 @@ mymain(void)
 
     DO_TEST_CAPS_LATEST("acpi-table");
 
-    DO_TEST("video-device-pciaddr-default",
-            QEMU_CAPS_KVM,
-            QEMU_CAPS_VNC,
-            QEMU_CAPS_DEVICE_QXL);
-    DO_TEST("video-qxl-heads", QEMU_CAPS_DEVICE_QXL);
-    DO_TEST("video-qxl-noheads", QEMU_CAPS_DEVICE_QXL);
-    DO_TEST("video-qxl-resolution", QEMU_CAPS_DEVICE_QXL);
-    DO_TEST("video-virtio-gpu-secondary", QEMU_CAPS_DEVICE_VIRTIO_GPU);
+    DO_TEST_CAPS_LATEST("video-device-pciaddr-default");
+    DO_TEST_CAPS_LATEST("video-qxl-heads");
+    DO_TEST_CAPS_LATEST("video-qxl-noheads");
+    DO_TEST_CAPS_LATEST("video-qxl-resolution");
+    DO_TEST_CAPS_LATEST("video-virtio-gpu-secondary");
     DO_TEST_CAPS_ARCH_LATEST("video-virtio-gpu-ccw", "s390x");
     DO_TEST_CAPS_ARCH_LATEST("video-virtio-gpu-ccw-auto", "s390x");
-    DO_TEST("video-none-device", QEMU_CAPS_VNC);
+    DO_TEST_CAPS_LATEST("video-none-device");
     DO_TEST_CAPS_LATEST("video-virtio-vga-gpu-gl");
     DO_TEST_CAPS_LATEST("video-virtio-blob-on");
     DO_TEST_CAPS_LATEST("video-virtio-blob-off");