Modernize 'disk-nvme', 'encrypted-disk-usage', 'encrypted-disk', and
'user-aliases' cases to use DO_TEST_CAPS_LATEST.
This will remove all uses of QEMU_CAPS_QCOW2_LUKS from the test suite.
Since the output files are done via symlinks to input files, the input
files need to be modernized with few auto-added XML bits.
Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
tests/qemuxml2argvdata/disk-nvme.xml | 5 ++++-
tests/qemuxml2argvdata/encrypted-disk-usage.xml | 5 ++++-
tests/qemuxml2argvdata/user-aliases.xml | 5 +++--
...{disk-nvme.xml => disk-nvme.x86_64-latest.xml} | 0
...xml => encrypted-disk-usage.x86_64-latest.xml} | 0
...-disk.xml => encrypted-disk.x86_64-latest.xml} | 5 ++++-
...aliases.xml => user-aliases.x86_64-latest.xml} | 0
tests/qemuxml2xmltest.c | 15 ++++-----------
8 files changed, 19 insertions(+), 16 deletions(-)
rename tests/qemuxml2xmloutdata/{disk-nvme.xml => disk-nvme.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{encrypted-disk-usage.xml => encrypted-disk-usage.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{encrypted-disk.xml => encrypted-disk.x86_64-latest.xml} (89%)
rename tests/qemuxml2xmloutdata/{user-aliases.xml => user-aliases.x86_64-latest.xml} (100%)
diff --git a/tests/qemuxml2argvdata/disk-nvme.xml b/tests/qemuxml2argvdata/disk-nvme.xml
index 226ea3d686..5e521ad6d3 100644
--- a/tests/qemuxml2argvdata/disk-nvme.xml
+++ b/tests/qemuxml2argvdata/disk-nvme.xml
@@ -8,6 +8,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>
@@ -49,7 +52,7 @@
<target dev='vdd' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
</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='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.xml b/tests/qemuxml2argvdata/encrypted-disk-usage.xml
index 43afacf220..7c5781b96f 100644
--- a/tests/qemuxml2argvdata/encrypted-disk-usage.xml
+++ b/tests/qemuxml2argvdata/encrypted-disk-usage.xml
@@ -8,6 +8,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>
@@ -23,7 +26,7 @@
</encryption>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
</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='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2argvdata/user-aliases.xml b/tests/qemuxml2argvdata/user-aliases.xml
index b688b84b56..9998c1e08f 100644
--- a/tests/qemuxml2argvdata/user-aliases.xml
+++ b/tests/qemuxml2argvdata/user-aliases.xml
@@ -19,7 +19,8 @@
<apic/>
<pae/>
</features>
- <cpu>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
<numa>
<cell id='0' cpus='0' memory='1048576' unit='KiB'/>
<cell id='1' cpus='1' memory='1048576' unit='KiB'/>
@@ -70,7 +71,7 @@
<alias name='ua-WhatAnAwesomeCDROM'/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
- <controller type='usb' index='0'>
+ <controller type='usb' index='0' model='piix3-uhci'>
<alias name='ua-SomeWeirdController'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
diff --git a/tests/qemuxml2xmloutdata/disk-nvme.xml b/tests/qemuxml2xmloutdata/disk-nvme.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-nvme.xml
rename to tests/qemuxml2xmloutdata/disk-nvme.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/encrypted-disk-usage.xml b/tests/qemuxml2xmloutdata/encrypted-disk-usage.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/encrypted-disk-usage.xml
rename to tests/qemuxml2xmloutdata/encrypted-disk-usage.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/encrypted-disk.xml b/tests/qemuxml2xmloutdata/encrypted-disk.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/encrypted-disk.xml
rename to tests/qemuxml2xmloutdata/encrypted-disk.x86_64-latest.xml
index b840f35fa7..abf0bf59fe 100644
--- a/tests/qemuxml2xmloutdata/encrypted-disk.xml
+++ b/tests/qemuxml2xmloutdata/encrypted-disk.x86_64-latest.xml
@@ -8,6 +8,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>
@@ -23,7 +26,7 @@
</encryption>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
</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='pci' index='0' model='pci-root'/>
diff --git a/tests/qemuxml2xmloutdata/user-aliases.xml b/tests/qemuxml2xmloutdata/user-aliases.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/user-aliases.xml
rename to tests/qemuxml2xmloutdata/user-aliases.x86_64-latest.xml
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index da0f6eabb7..6bf2ed8d30 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -349,7 +349,7 @@ mymain(void)
DO_TEST_NOCAPS("disk-network-tlsx509-nbd");
DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname");
DO_TEST_NOCAPS("disk-network-tlsx509-vxhs");
- DO_TEST("disk-nvme", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_QCOW2_LUKS);
+ DO_TEST_CAPS_LATEST("disk-nvme");
DO_TEST_CAPS_LATEST("disk-vhostuser");
DO_TEST_CAPS_LATEST("disk-scsi");
DO_TEST("disk-virtio-scsi-reservations",
@@ -570,8 +570,8 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-slices");
DO_TEST_CAPS_LATEST("disk-rotation");
- DO_TEST("encrypted-disk", QEMU_CAPS_QCOW2_LUKS);
- DO_TEST("encrypted-disk-usage", QEMU_CAPS_QCOW2_LUKS);
+ DO_TEST_CAPS_LATEST("encrypted-disk");
+ DO_TEST_CAPS_LATEST("encrypted-disk-usage");
DO_TEST_CAPS_LATEST("luks-disks");
DO_TEST_CAPS_LATEST("luks-disks-source");
DO_TEST_CAPS_LATEST("luks-disks-source-qcow2");
@@ -1293,14 +1293,7 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-compat", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-exact", "ppc64");
- DO_TEST("user-aliases",
- QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_QCOW2_LUKS,
- QEMU_CAPS_OBJECT_MEMORY_FILE,
- QEMU_CAPS_PIIX_DISABLE_S3,
- QEMU_CAPS_PIIX_DISABLE_S4,
- QEMU_CAPS_VNC,
- QEMU_CAPS_CCID_EMULATED);
+ DO_TEST_CAPS_LATEST("user-aliases");
DO_TEST("input-virtio-ccw",
QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_KEYBOARD,
--
2.36.1
