Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
Reviewed-by: Tim Wiederhake <twiederh@xxxxxxxxxx>
---
...s-spice-auto-socket-cfg.x86_64-latest.xml} | 5 ++-
...phics-spice-auto-socket.x86_64-latest.xml} | 5 ++-
...phics-spice-compression.x86_64-latest.xml} | 5 ++-
...hics-spice-egl-headless.x86_64-latest.xml} | 5 ++-
... graphics-spice-qxl-vga.x86_64-latest.xml} | 5 ++-
...> graphics-spice-socket.x86_64-latest.xml} | 5 ++-
... graphics-spice-timeout.x86_64-latest.xml} | 2 +-
...e.xml => graphics-spice.x86_64-latest.xml} | 5 ++-
tests/qemuxml2xmltest.c | 35 +++++--------------
9 files changed, 37 insertions(+), 35 deletions(-)
rename tests/qemuxml2xmloutdata/{graphics-spice-auto-socket-cfg.xml => graphics-spice-auto-socket-cfg.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{graphics-spice-auto-socket.xml => graphics-spice-auto-socket.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{graphics-spice-compression.xml => graphics-spice-compression.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{graphics-spice-egl-headless.xml => graphics-spice-egl-headless.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{graphics-spice-qxl-vga.xml => graphics-spice-qxl-vga.x86_64-latest.xml} (91%)
rename tests/qemuxml2xmloutdata/{graphics-spice-socket.xml => graphics-spice-socket.x86_64-latest.xml} (88%)
rename tests/qemuxml2xmloutdata/{graphics-spice-timeout.xml => graphics-spice-timeout.x86_64-latest.xml} (98%)
rename tests/qemuxml2xmloutdata/{graphics-spice.xml => graphics-spice.x86_64-latest.xml} (92%)
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.x86_64-latest.xml
index f55c4b28a0..c6e2db610e 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='i686' 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>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-i386</emulator>
- <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/graphics-spice-auto-socket.xml b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-auto-socket.x86_64-latest.xml
index a2d6688ffe..50386c74ce 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='i686' 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>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-i386</emulator>
- <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/graphics-spice-compression.xml b/tests/qemuxml2xmloutdata/graphics-spice-compression.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/graphics-spice-compression.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-compression.x86_64-latest.xml
index 385128b76a..9903efc4ed 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-compression.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='i686' 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>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-i386</emulator>
- <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/graphics-spice-egl-headless.xml b/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-egl-headless.x86_64-latest.xml
index edf34439e9..c9bab0de11 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='i686' 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>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-i386</emulator>
- <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/graphics-spice-qxl-vga.xml b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.x86_64-latest.xml
index acd6610566..cb687cf788 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='i686' 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>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-i386</emulator>
- <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/graphics-spice-socket.xml b/tests/qemuxml2xmloutdata/graphics-spice-socket.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/graphics-spice-socket.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-socket.x86_64-latest.xml
index dc429d3953..0e34ab8551 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-socket.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-socket.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='i686' 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>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-i386</emulator>
- <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/graphics-spice-timeout.xml b/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
similarity index 98%
rename from tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
rename to tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
index bd0249df28..fd34a6caf5 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
@@ -45,7 +45,7 @@
<controller type='virtio-serial' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
</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/graphics-spice.xml b/tests/qemuxml2xmloutdata/graphics-spice.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/graphics-spice.xml
rename to tests/qemuxml2xmloutdata/graphics-spice.x86_64-latest.xml
index b4af4f0820..31ce5c8d7d 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice.x86_64-latest.xml
@@ -8,13 +8,16 @@
<type arch='i686' 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>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-i386</emulator>
- <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 3abf58a9f4..7ea066fcda 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -388,36 +388,17 @@ mymain(void)
DO_TEST("graphics-sdl-fullscreen", QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_SDL);
cfg->spiceTLS = true;
- DO_TEST("graphics-spice",
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_SPICE);
- DO_TEST("graphics-spice-compression",
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_SPICE);
- DO_TEST("graphics-spice-qxl-vga",
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_SPICE);
- DO_TEST("graphics-spice-socket",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_SPICE,
- QEMU_CAPS_SPICE_UNIX);
- DO_TEST("graphics-spice-auto-socket",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_SPICE,
- QEMU_CAPS_SPICE_UNIX);
+ DO_TEST_CAPS_LATEST("graphics-spice");
+ DO_TEST_CAPS_LATEST("graphics-spice-compression");
+ DO_TEST_CAPS_LATEST("graphics-spice-qxl-vga");
+ DO_TEST_CAPS_LATEST("graphics-spice-socket");
+ DO_TEST_CAPS_LATEST("graphics-spice-auto-socket");
cfg->spiceAutoUnixSocket = true;
- DO_TEST("graphics-spice-auto-socket-cfg",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_SPICE);
+ DO_TEST_CAPS_LATEST("graphics-spice-auto-socket-cfg");
cfg->spiceAutoUnixSocket = false;
cfg->spiceTLS = false;
- DO_TEST("graphics-spice-egl-headless",
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_SPICE,
- QEMU_CAPS_EGL_HEADLESS);
- DO_TEST("graphics-spice-timeout",
- QEMU_CAPS_DEVICE_VGA,
- QEMU_CAPS_SPICE);
+ DO_TEST_CAPS_LATEST("graphics-spice-egl-headless");
+ DO_TEST_CAPS_LATEST("graphics-spice-timeout");
DO_TEST("graphics-egl-headless-rendernode",
QEMU_CAPS_DEVICE_CIRRUS_VGA,
--
2.31.1
