From 8eae01ba28677c41587794ddac2c295b75e77df5 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 15 Jul 2022 16:35:27 +0200 Subject: [PATCH] qemuxml2xmltest: Modernize all test cases using QEMU_CAPS_QCOW2_LUKS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Pavel Hrdina Reviewed-by: Ján Tomko --- 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 @@ hvm + + qemu64 + destroy restart @@ -49,7 +52,7 @@
- +
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 @@ hvm + + qemu64 + destroy restart @@ -23,7 +26,7 @@
- +
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 @@ - + + qemu64 @@ -70,7 +71,7 @@
- +
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 @@ hvm + + qemu64 + destroy restart @@ -23,7 +26,7 @@
- +
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 8299c724c1..32e331ca5d 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"); @@ -1297,14 +1297,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,