External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: qemuxml2xml: use latest caps for spice tests

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko 2021-10-13 17:03:33 +02:00
parent ee7a03bd55
commit 966e08ebef
9 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml → tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.x86_64-latest.xml
View File

@ -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'>

5
tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml → tests/qemuxml2xmloutdata/graphics-spice-auto-socket.x86_64-latest.xml
View File

@ -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'>

5
tests/qemuxml2xmloutdata/graphics-spice-compression.xml → tests/qemuxml2xmloutdata/graphics-spice-compression.x86_64-latest.xml
View File

@ -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'>

5
tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml → tests/qemuxml2xmloutdata/graphics-spice-egl-headless.x86_64-latest.xml
View File

@ -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'>

5
tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml → tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.x86_64-latest.xml
View File

@ -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'>

5
tests/qemuxml2xmloutdata/graphics-spice-socket.xml → tests/qemuxml2xmloutdata/graphics-spice-socket.x86_64-latest.xml
View File

@ -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'>

2
tests/qemuxml2xmloutdata/graphics-spice-timeout.xml → tests/qemuxml2xmloutdata/graphics-spice-timeout.x86_64-latest.xml
View File

@ -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'/>

5
tests/qemuxml2xmloutdata/graphics-spice.xml → tests/qemuxml2xmloutdata/graphics-spice.x86_64-latest.xml
View File

@ -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'>

35
tests/qemuxml2xmltest.c
View File

@ -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,