From: Peter Krempa Date: Fri, 24 Mar 2023 12:45:41 +0000 (+0100) Subject: qemuxml2argvtest: Remove obsolete negative tests X-Git-Tag: v9.3.0-rc1~142 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5203380907c2bb4df4efb28fc21a7588fb9687ef;p=thirdparty%2Flibvirt.git qemuxml2argvtest: Remove obsolete negative tests The 'hostdev-subsys-mdev-vfio-ccw', 'hostdev-vfio-zpci', and 'hostdev-vfio-zpci-autogenerate-fids' test cases have negative versions which are invoked without capabilities. This does not make sense going forward as the tests are going to be switched to real capabilities. Remove them. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.err b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.err deleted file mode 100644 index 88c13f62b6..0000000000 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: VFIO CCW device assignment is not supported by this version of QEMU diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.err b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.err deleted file mode 100644 index a0ca4fba5d..0000000000 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.err +++ /dev/null @@ -1 +0,0 @@ -XML error: No PCI buses available diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.err b/tests/qemuxml2argvdata/hostdev-vfio-zpci.err deleted file mode 100644 index 842693b4e0..0000000000 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: This QEMU binary doesn't support zPCI diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4fada9725f..dbf8509f6d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1750,8 +1750,6 @@ mymain(void) DO_TEST("hostdev-vfio-zpci", QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_DEVICE_ZPCI); - DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-autogenerate-fids", - QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-vfio-zpci-invalid-uid-valid-fid", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-multidomain-many", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate", "s390x"); @@ -1764,8 +1762,6 @@ mymain(void) QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_ZPCI); - DO_TEST_PARSE_ERROR("hostdev-vfio-zpci", - QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-duplicate", QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_DEVICE_ZPCI); @@ -1781,7 +1777,6 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw-boot", "s390x"); - DO_TEST_PARSE_ERROR_NOCAPS("hostdev-subsys-mdev-vfio-ccw"); DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-duplicate-address", QEMU_CAPS_DEVICE_VFIO_CCW); DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-invalid-address",