Originally when I started working on '-blockdev' support I added version
locked variants of all the relevant disk tests locked to qemu-2.12.
Upcoming patches will be removing support for qemu-2.12, but '-blockdev'
is used only with qemu-4.2 and later.
This patch adds variants locked to qemu-4.1 for all the disk tests that
have a variant for 2.11 (with a slight exception of the
'disk-error-policy-s390x' case locked to qemu-4.0 as we don't have
qemu-4.1 caps for s390x).
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
.../disk-aio.x86_64-4.1.0.args | 36 ++++++++++++++
...isk-backing-chains-index.x86_64-4.1.0.args | 45 +++++++++++++++++
...k-backing-chains-noindex.x86_64-4.1.0.args | 45 +++++++++++++++++
.../disk-cache.x86_64-4.1.0.args | 42 ++++++++++++++++
.../disk-cdrom-network.x86_64-4.1.0.args | 37 ++++++++++++++
.../disk-cdrom-tray.x86_64-4.1.0.args | 38 ++++++++++++++
.../disk-cdrom.x86_64-4.1.0.args | 39 +++++++++++++++
.../disk-copy_on_read.x86_64-4.1.0.args | 39 +++++++++++++++
.../disk-detect-zeroes.x86_64-4.1.0.args | 37 ++++++++++++++
.../disk-error-policy-s390x.s390x-4.0.0.args | 35 +++++++++++++
.../disk-error-policy.x86_64-4.1.0.args | 37 ++++++++++++++
.../disk-floppy-q35.x86_64-4.1.0.args | 36 ++++++++++++++
.../disk-floppy.x86_64-4.1.0.args | 37 ++++++++++++++
.../disk-network-gluster.x86_64-4.1.0.args | 37 ++++++++++++++
.../disk-network-iscsi.x86_64-4.1.0.args | 49 +++++++++++++++++++
.../disk-network-nbd.x86_64-4.1.0.args | 41 ++++++++++++++++
.../disk-network-rbd.x86_64-4.1.0.args | 44 +++++++++++++++++
.../disk-network-sheepdog.x86_64-4.1.0.args | 35 +++++++++++++
...disk-network-source-auth.x86_64-4.1.0.args | 40 +++++++++++++++
...disk-network-tlsx509-nbd.x86_64-4.1.0.args | 35 +++++++++++++
...isk-network-tlsx509-vxhs.x86_64-4.1.0.args | 41 ++++++++++++++++
.../disk-readonly-disk.x86_64-4.1.0.args | 36 ++++++++++++++
.../disk-shared.x86_64-4.1.0.args | 41 ++++++++++++++++
...virtio-scsi-reservations.x86_64-4.1.0.args | 39 +++++++++++++++
.../floppy-drive-fat.x86_64-4.1.0.args | 35 +++++++++++++
tests/qemuxml2argvtest.c | 27 ++++++++++
26 files changed, 1003 insertions(+)
create mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args
create mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args
create mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args
[snipped]
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 6cf35a0ebf..53f0706d85 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1391,17 +1391,23 @@ 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");
DO_TEST_CAPS_LATEST("disk-floppy-tray");
@@ -1414,8 +1420,10 @@ mymain(void)
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");
DO_TEST_CAPS_LATEST("disk-fmt-qcow");
@@ -1423,43 +1431,56 @@ mymain(void)
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");
DO_TEST_CAPS_LATEST("disk-network-http");
@@ -1484,6 +1505,7 @@ mymain(void)
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");
DO_TEST_CAPS_VER("disk-source-pool", "4.1.0");
@@ -1492,10 +1514,12 @@ mymain(void)
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");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-same-targets");
@@ -1512,8 +1536,10 @@ mymain(void)
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");
DO_TEST_CAPS_LATEST("disk-slices");
@@ -1541,6 +1567,7 @@ mymain(void)
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");
--
2.34.1
On a Thursday in 2022, Peter Krempa wrote: >Originally when I started working on '-blockdev' support I added version >locked variants of all the relevant disk tests locked to qemu-2.12. >Upcoming patches will be removing support for qemu-2.12, but '-blockdev' >is used only with qemu-4.2 and later. > There is no need for this note. You can simply remove the 2.12-versionned tests in the same commit where you add these. There are no meaningful variations in the command line between them (and git's rename detection would make the patch better suited for the list) Jano >This patch adds variants locked to qemu-4.1 for all the disk tests that >have a variant for 2.11 (with a slight exception of the >'disk-error-policy-s390x' case locked to qemu-4.0 as we don't have >qemu-4.1 caps for s390x). > >Signed-off-by: Peter Krempa <pkrempa@redhat.com> >--- > .../disk-aio.x86_64-4.1.0.args | 36 ++++++++++++++
© 2016 - 2026 Red Hat, Inc.