[PATCH 02/20] tests: qemuxml2argv: Remove pre-blockdev versions of disk-related tests

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Upcoming patches will bump minimum supported qemu version to 4.2 which
will use '-blockdev' with qemu so we can drop all the old test cases for
pre-blockdev configs.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 .../blkdeviotune-group-num.x86_64-4.1.0.args  | 37 --------------
 .../blkdeviotune-max-length.x86_64-4.1.0.args | 37 --------------
 .../blkdeviotune-max.x86_64-4.1.0.args        | 37 --------------
 .../disk-aio.x86_64-4.1.0.args                | 36 -------------
 .../disk-arm-virtio-sd.aarch64-4.0.0.args     | 38 --------------
 ...isk-backing-chains-index.x86_64-4.1.0.args | 45 ----------------
 ...k-backing-chains-noindex.x86_64-4.1.0.args |  1 -
 .../disk-cache.x86_64-3.1.0.args              | 42 ---------------
 .../disk-cache.x86_64-4.1.0.args              | 42 ---------------
 .../disk-cdrom-network.x86_64-4.1.0.args      | 39 --------------
 .../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-discard.x86_64-4.1.0.args            | 36 -------------
 .../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-fmt-qcow.x86_64-4.1.0.args           | 35 -------------
 .../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-no-colon.x86_64-4.1.0.err |  1 -
 .../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-3.1.0.args             | 41 ---------------
 .../disk-shared.x86_64-4.1.0.args             | 41 ---------------
 .../disk-source-pool-mode.x86_64-4.1.0.args   | 40 ---------------
 .../disk-source-pool.x86_64-4.1.0.args        | 42 ---------------
 .../disk-transient.x86_64-4.1.0.err           |  1 -
 ...virtio-scsi-reservations.x86_64-4.1.0.args | 39 --------------
 .../encrypted-disk-usage.x86_64-4.1.0.args    | 35 -------------
 .../encrypted-disk.x86_64-4.1.0.args          | 35 -------------
 ...l-efi-nvram-network-iscsi.x86_64-4.1.0.err |  1 -
 .../floppy-drive-fat.x86_64-4.1.0.args        | 35 -------------
 .../hostdev-scsi-lsi.x86_64-4.1.0.args        | 49 ------------------
 ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 51 -------------------
 .../luks-disks-source.x86_64-4.1.0.args       | 48 -----------------
 .../luks-disks.x86_64-4.1.0.args              | 39 --------------
 tests/qemuxml2argvtest.c                      | 45 ----------------
 45 files changed, 1624 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args
 delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-source-pool.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-transient.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/encrypted-disk.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/luks-disks-source.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/luks-disks.x86_64-4.1.0.args


 Truncated all the file deletions.

 [...]

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 78b89ee91a..b801bd43d8 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1202,7 +1202,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-template");
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-iscsi");
-    DO_TEST_CAPS_VER_PARSE_ERROR("firmware-manual-efi-nvram-network-iscsi", "4.1.0");
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-nbd");
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-file");

@@ -1335,18 +1334,12 @@ 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", "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", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-cdrom-network");
-    DO_TEST_CAPS_VER("disk-cdrom-tray", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-cdrom-tray");
-    DO_TEST_CAPS_VER("disk-floppy", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-floppy");
-    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");
@@ -1358,57 +1351,38 @@ 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", "4.1.0");
     DO_TEST_CAPS_LATEST("floppy-drive-fat");
-    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");
     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", "3.1.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", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-error-policy");
-    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", "3.1.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", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-network-nbd");
-    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", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-network-gluster");
-    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_LATEST_PARSE_ERROR("disk-encryption-wrong");
-    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", "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", "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", "4.1.0");
     DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "5.2.0");
-    DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd");
     DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-tlsx509-nbd-hostname", "6.2.0");
     DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname");
@@ -1434,19 +1408,13 @@ 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", "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");
     DO_TEST_CAPS_LATEST("disk-source-pool");
-    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", "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", "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");
@@ -1462,24 +1430,17 @@ 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", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-backing-chains-index");
-    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");
     DO_TEST_CAPS_LATEST("disk-rotation");

-    DO_TEST_CAPS_ARCH_VER("disk-arm-virtio-sd", "aarch64", "4.0.0");
     DO_TEST_CAPS_ARCH_LATEST("disk-arm-virtio-sd", "aarch64");

-    DO_TEST_CAPS_VER("encrypted-disk", "4.1.0");
     DO_TEST_CAPS_LATEST("encrypted-disk");
-    DO_TEST_CAPS_VER("encrypted-disk-usage", "4.1.0");
     DO_TEST_CAPS_LATEST("encrypted-disk-usage");
-    DO_TEST_CAPS_VER("luks-disks", "4.1.0");
     DO_TEST_CAPS_LATEST("luks-disks");
-    DO_TEST_CAPS_VER("luks-disks-source", "4.1.0");
     DO_TEST_CAPS_LATEST("luks-disks-source");
     DO_TEST_CAPS_VER("luks-disks-source-qcow2", "5.2.0");
     DO_TEST_CAPS_LATEST("luks-disks-source-qcow2");
@@ -1491,7 +1452,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("disk-geometry");
     DO_TEST_CAPS_LATEST("disk-blockio");

-    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");

@@ -2179,11 +2139,8 @@ mymain(void)
     DO_TEST_NOCAPS("numad-auto-memory-vcpu-no-cpuset-and-placement");
     DO_TEST_NOCAPS("numad-static-memory-auto-vcpu");
     DO_TEST_CAPS_LATEST("blkdeviotune");
-    DO_TEST_CAPS_VER("blkdeviotune-max", "4.1.0");
     DO_TEST_CAPS_LATEST("blkdeviotune-max");
-    DO_TEST_CAPS_VER("blkdeviotune-group-num", "4.1.0");
     DO_TEST_CAPS_LATEST("blkdeviotune-group-num");
-    DO_TEST_CAPS_VER("blkdeviotune-max-length", "4.1.0");
     DO_TEST_CAPS_LATEST("blkdeviotune-max-length");

     DO_TEST("multifunction-pci-device",
@@ -2834,9 +2791,7 @@ mymain(void)
                         QEMU_CAPS_DEVICE_PXB_PCIE);
     DO_TEST_CAPS_ARCH_LATEST("pcie-expander-bus-aarch64", "aarch64");

-    DO_TEST_CAPS_VER("hostdev-scsi-lsi", "4.1.0");
     DO_TEST_CAPS_LATEST("hostdev-scsi-lsi");
-    DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "4.1.0");
     DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi");

     DO_TEST("hostdev-scsi-vhost-scsi-ccw",
-- 
2.36.1




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux