[libvirt PATCH v2 3/4] tests: qemuxml2xmltest: Convert disk-scsi to DO_TEST_CAPS_LATEST
Signed-off-by: Chris Jester-Young <cky(a)cky.nz>
---
.../{disk-scsi.xml => disk-scsi.x86_64-latest.xml} | 13 ++++++++-----
tests/qemuxml2xmltest.c | 3 +--
2 files changed, 9 insertions(+), 7 deletions(-)
rename tests/qemuxml2xmloutdata/{disk-scsi.xml => disk-scsi.x86_64-latest.xml} (92%)
diff --git a/tests/qemuxml2xmloutdata/disk-scsi.xml
b/tests/qemuxml2xmloutdata/disk-scsi.x86_64-latest.xml
similarity index 92%
rename from tests/qemuxml2xmloutdata/disk-scsi.xml
rename to tests/qemuxml2xmloutdata/disk-scsi.x86_64-latest.xml
index 062a907303..c5fd3c0657 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi.x86_64-latest.xml
@@ -8,6 +8,9 @@
<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>
@@ -46,20 +49,20 @@
<target dev='sdd' bus='scsi'/>
<address type='drive' controller='3' 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'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
<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 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 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 type='scsi' index='3' model='ibmvscsi'>
<address type='spapr-vio' reg='0x00002000'/>
@@ -68,7 +71,7 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<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>
</devices>
</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index e7480fcf9d..033f81013e 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -339,8 +339,7 @@ mymain(void)
DO_TEST("disk-network-vxhs", NONE);
DO_TEST("disk-network-tlsx509", NONE);
DO_TEST("disk-nvme", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_QCOW2_LUKS);
- DO_TEST("disk-scsi", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_SCSI_MEGASAS,
- QEMU_CAPS_SCSI_MPTSAS1068, QEMU_CAPS_SCSI_DISK_WWN);
+ DO_TEST_CAPS_LATEST("disk-scsi");
DO_TEST("disk-virtio-scsi-reservations",
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_PR_MANAGER_HELPER);
DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI);
--
2.25.1