External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: qemuxml2xmltest: Convert disk-scsi to DO_TEST_CAPS_LATEST

Browse Source 
Signed-off-by: Chris Jester-Young <cky@cky.nz>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Chris Jester-Young 2020-05-12 21:55:47 -04:00 committed by Peter Krempa
parent 363c9865ae
commit eada1e2de9
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/qemuxml2xmloutdata/disk-scsi.xml → tests/qemuxml2xmloutdata/disk-scsi.x86_64-latest.xml
View File

@ -8,6 +8,9 @@
<type arch='i686' machine='pc'>hvm</type> <type arch='i686' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>qemu64</model>
</cpu>
<clock offset='utc'/> <clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
@ -46,20 +49,20 @@
<target dev='sdd' bus='scsi'/> <target dev='sdd' bus='scsi'/>
<address type='drive' controller='3' bus='0' target='0' unit='0'/> <address type='drive' controller='3' bus='0' target='0' unit='0'/>
</disk> </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'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller> </controller>
<controller type='ide' index='0'> <controller type='ide' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
</controller> </controller>
<controller type='scsi' index='0' model='lsilogic'> <controller type='scsi' index='0' model='lsilogic'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</controller> </controller>
<controller type='scsi' index='1' model='lsisas1078'> <controller type='scsi' index='1' model='lsisas1078'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</controller> </controller>
<controller type='scsi' index='2' model='lsisas1068'> <controller type='scsi' index='2' model='lsisas1068'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
</controller> </controller>
<controller type='scsi' index='3' model='ibmvscsi'> <controller type='scsi' index='3' model='ibmvscsi'>
<address type='spapr-vio' reg='0x00002000'/> <address type='spapr-vio' reg='0x00002000'/>
@ -68,7 +71,7 @@
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/> <input type='keyboard' bus='ps2'/>
<memballoon model='virtio'> <memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
</memballoon> </memballoon>
</devices> </devices>
</domain> </domain>

3
tests/qemuxml2xmltest.c
View File

@ -339,8 +339,7 @@ mymain(void)
DO_TEST("disk-network-vxhs", NONE); DO_TEST("disk-network-vxhs", NONE);
DO_TEST("disk-network-tlsx509", NONE); DO_TEST("disk-network-tlsx509", NONE);
DO_TEST("disk-nvme", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_QCOW2_LUKS); DO_TEST("disk-nvme", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_QCOW2_LUKS);
DO_TEST("disk-scsi", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_SCSI_MEGASAS, DO_TEST_CAPS_LATEST("disk-scsi");
QEMU_CAPS_SCSI_MPTSAS1068, QEMU_CAPS_SCSI_DISK_WWN);
DO_TEST("disk-virtio-scsi-reservations", DO_TEST("disk-virtio-scsi-reservations",
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER); QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER);
DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI);