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

qemuxml2xmltest: Modernize iothread CWW/SCSI test cases

Browse Source 
The argv counterparts are already modernized.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-02-22 15:37:52 +01:00
parent dcab6ad185
commit 17bc74e02d
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml → tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.s390x-latest.xml
View File

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

4
tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml → tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.s390x-latest.xml
View File

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

5
tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml → tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.x86_64-latest.xml
View File

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

8
tests/qemuxml2xmltest.c
View File

@ -577,11 +577,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");