[PATCH 06/19] qemuxml2agvtest: Retire tests based on qemu-2.12

Upcoming patches will raise the minimum required qemu version to 3.1. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- .../cpu-host-model.x86_64-2.12.0.args | 36 -------------- .../disk-aio.x86_64-2.12.0.args | 36 -------------- ...sk-backing-chains-index.x86_64-2.12.0.args | 1 - ...-backing-chains-noindex.x86_64-2.12.0.args | 45 ----------------- .../disk-cache.x86_64-2.12.0.args | 42 ---------------- .../disk-cdrom-network.x86_64-2.12.0.args | 37 -------------- .../disk-cdrom-tray.x86_64-2.12.0.args | 38 -------------- .../disk-cdrom.x86_64-2.12.0.args | 39 --------------- .../disk-copy_on_read.x86_64-2.12.0.args | 39 --------------- .../disk-detect-zeroes.x86_64-2.12.0.args | 37 -------------- .../disk-error-policy.x86_64-2.12.0.args | 37 -------------- .../disk-floppy-q35.x86_64-2.12.0.args | 36 -------------- .../disk-floppy.x86_64-2.12.0.args | 37 -------------- .../disk-network-gluster.x86_64-2.12.0.args | 37 -------------- .../disk-network-iscsi.x86_64-2.12.0.args | 49 ------------------- .../disk-network-nbd.x86_64-2.12.0.args | 41 ---------------- .../disk-network-rbd.x86_64-2.12.0.args | 44 ----------------- .../disk-network-sheepdog.x86_64-2.12.0.args | 35 ------------- ...isk-network-source-auth.x86_64-2.12.0.args | 40 --------------- ...isk-network-tlsx509-nbd.x86_64-2.12.0.args | 35 ------------- ...sk-network-tlsx509-vxhs.x86_64-2.12.0.args | 41 ---------------- .../disk-readonly-disk.x86_64-2.12.0.args | 36 -------------- .../disk-shared.x86_64-2.12.0.args | 41 ---------------- ...irtio-scsi-reservations.x86_64-2.12.0.args | 39 --------------- .../floppy-drive-fat.x86_64-2.12.0.args | 35 ------------- ...v-missing-platform-info.x86_64-2.12.0.args | 34 ------------- .../launch-security-sev.x86_64-2.12.0.args | 34 ------------- tests/qemuxml2argvtest.c | 28 ----------- 28 files changed, 1029 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args delete mode 100644 tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args [snipped] diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 75d9d00435..34f1f714a0 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1392,21 +1392,16 @@ mymain(void) DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); /* qemu-4.1 was the last qemu version which we didn't use -blockdev with */ - DO_TEST_CAPS_VER("disk-cdrom", "2.12.0"); DO_TEST_CAPS_VER("disk-cdrom", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom"); DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid"); DO_TEST_CAPS_LATEST("disk-cdrom-bus-other"); - DO_TEST_CAPS_VER("disk-cdrom-network", "2.12.0"); DO_TEST_CAPS_VER("disk-cdrom-network", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom-network"); - DO_TEST_CAPS_VER("disk-cdrom-tray", "2.12.0"); DO_TEST_CAPS_VER("disk-cdrom-tray", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom-tray"); - DO_TEST_CAPS_VER("disk-floppy", "2.12.0"); DO_TEST_CAPS_VER("disk-floppy", "4.1.0"); DO_TEST_CAPS_LATEST("disk-floppy"); - DO_TEST_CAPS_VER("disk-floppy-q35", "2.12.0"); DO_TEST_CAPS_VER("disk-floppy-q35", "4.1.0"); DO_TEST_CAPS_LATEST("disk-floppy-q35"); DO_TEST_CAPS_ARCH_LATEST_FAILURE("disk-floppy-pseries", "ppc64"); @@ -1419,10 +1414,8 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-virtio-queues"); DO_TEST_CAPS_LATEST("disk-boot-disk"); DO_TEST_CAPS_LATEST("disk-boot-cdrom"); - DO_TEST_CAPS_VER("floppy-drive-fat", "2.12.0"); DO_TEST_CAPS_VER("floppy-drive-fat", "4.1.0"); DO_TEST_CAPS_LATEST("floppy-drive-fat"); - DO_TEST_CAPS_VER("disk-readonly-disk", "2.12.0"); DO_TEST_CAPS_VER("disk-readonly-disk", "4.1.0"); DO_TEST_CAPS_LATEST("disk-readonly-disk"); DO_TEST_CAPS_VER("disk-fmt-qcow", "4.1.0"); @@ -1430,56 +1423,44 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-cow"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-dir"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-iso"); - DO_TEST_CAPS_VER("disk-shared", "2.12.0"); DO_TEST_CAPS_VER("disk-shared", "4.1.0"); DO_TEST_CAPS_LATEST("disk-shared"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-shared-qcow"); - DO_TEST_CAPS_VER("disk-error-policy", "2.12.0"); DO_TEST_CAPS_VER("disk-error-policy", "4.1.0"); DO_TEST_CAPS_LATEST("disk-error-policy"); - DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "2.12.0"); DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "4.0.0"); DO_TEST_CAPS_ARCH_LATEST("disk-error-policy-s390x", "s390x"); - DO_TEST_CAPS_VER("disk-cache", "2.12.0"); DO_TEST_CAPS_VER("disk-cache", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cache"); DO_TEST_CAPS_LATEST("disk-metadata-cache"); DO_TEST_CAPS_ARCH_VER_PARSE_ERROR("disk-transient", "x86_64", "4.1.0"); DO_TEST_CAPS_LATEST("disk-transient"); - DO_TEST_CAPS_VER("disk-network-nbd", "2.12.0"); DO_TEST_CAPS_VER("disk-network-nbd", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-nbd"); - DO_TEST_CAPS_VER("disk-network-iscsi", "2.12.0"); DO_TEST_CAPS_VER("disk-network-iscsi", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-iscsi"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrettype"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-source-auth-both"); - DO_TEST_CAPS_VER("disk-network-gluster", "2.12.0"); DO_TEST_CAPS_VER("disk-network-gluster", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-gluster"); - DO_TEST_CAPS_VER("disk-network-rbd", "2.12.0"); DO_TEST_CAPS_VER("disk-network-rbd", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-rbd"); DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-rbd-encryption", "6.0.0"); DO_TEST_CAPS_LATEST("disk-network-rbd-encryption"); DO_TEST_CAPS_VER_FAILURE("disk-network-rbd-no-colon", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-rbd-no-colon"); - DO_TEST_CAPS_VER("disk-network-sheepdog", "2.12.0"); DO_TEST_CAPS_VER("disk-network-sheepdog", "4.1.0"); /* qemu-6.0 is the last qemu version supporting sheepdog */ DO_TEST_CAPS_VER("disk-network-sheepdog", "6.0.0"); - DO_TEST_CAPS_VER("disk-network-source-auth", "2.12.0"); DO_TEST_CAPS_VER("disk-network-source-auth", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-source-auth"); DO_TEST_CAPS_LATEST("disk-network-nfs"); driver.config->vxhsTLS = 1; driver.config->nbdTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea"); driver.config->vxhsTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea"); - DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "2.12.0"); DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "4.1.0"); DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "5.2.0"); - DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "2.12.0"); DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd"); DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0"); @@ -1504,7 +1485,6 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-disk-vpd-build-error"); DO_TEST_CAPS_LATEST("controller-virtio-scsi"); DO_TEST_CAPS_LATEST("disk-sata-device"); - DO_TEST_CAPS_VER("disk-aio", "2.12.0"); DO_TEST_CAPS_VER("disk-aio", "4.1.0"); DO_TEST_CAPS_LATEST("disk-aio"); DO_TEST_CAPS_LATEST("disk-aio-io_uring"); @@ -1513,12 +1493,10 @@ mymain(void) DO_TEST_CAPS_VER("disk-source-pool-mode", "4.1.0"); DO_TEST_CAPS_LATEST("disk-source-pool-mode"); DO_TEST_CAPS_LATEST("disk-ioeventfd"); - DO_TEST_CAPS_VER("disk-copy_on_read", "2.12.0"); DO_TEST_CAPS_VER("disk-copy_on_read", "4.1.0"); DO_TEST_CAPS_LATEST("disk-copy_on_read"); DO_TEST_CAPS_VER("disk-discard", "4.1.0"); DO_TEST_CAPS_LATEST("disk-discard"); - DO_TEST_CAPS_VER("disk-detect-zeroes", "2.12.0"); DO_TEST_CAPS_VER("disk-detect-zeroes", "4.1.0"); DO_TEST_CAPS_LATEST("disk-detect-zeroes"); DO_TEST_CAPS_LATEST("disk-snapshot"); @@ -1535,10 +1513,8 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-ide-incompatible-address"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-sata-incompatible-address"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-incompatible-address"); - DO_TEST_CAPS_VER("disk-backing-chains-index", "2.12.0"); DO_TEST_CAPS_VER("disk-backing-chains-index", "4.1.0"); DO_TEST_CAPS_LATEST("disk-backing-chains-index"); - DO_TEST_CAPS_VER("disk-backing-chains-noindex", "2.12.0"); DO_TEST_CAPS_VER("disk-backing-chains-noindex", "4.1.0"); DO_TEST_CAPS_LATEST("disk-backing-chains-noindex"); @@ -1566,7 +1542,6 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-geometry"); DO_TEST_CAPS_LATEST("disk-blockio"); - DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "2.12.0"); DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "4.1.0"); DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0"); DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); @@ -2133,7 +2108,6 @@ mymain(void) /* host-model cpu expansion depends on the cpu reported by qemu and thus * we invoke it for all real capability dumps we have */ - DO_TEST_CAPS_VER("cpu-host-model", "2.12.0"); DO_TEST_CAPS_VER("cpu-host-model", "3.0.0"); DO_TEST_CAPS_VER("cpu-host-model", "3.1.0"); DO_TEST_CAPS_VER("cpu-host-model", "4.0.0"); @@ -3437,9 +3411,7 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-auto", "s390x"); DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-iommu", "s390x"); - DO_TEST_CAPS_VER("launch-security-sev", "2.12.0"); DO_TEST_CAPS_VER("launch-security-sev", "6.0.0"); - DO_TEST_CAPS_VER("launch-security-sev-missing-platform-info", "2.12.0"); DO_TEST_CAPS_VER("launch-security-sev-missing-platform-info", "6.0.0"); DO_TEST_CAPS_ARCH_LATEST_FULL("launch-security-sev-direct", "x86_64", -- 2.34.1