There are some tests cases in qemuxml2argvtest that aim to check whether our validator rejects <driver iommu=''/> when QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM capability is not present. Well, such scenario can't happen really because the capability will always be present. Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> --- .../virtio-options-controller-iommu.err | 1 - .../qemuxml2argvdata/virtio-options-disk-iommu.err | 1 - tests/qemuxml2argvdata/virtio-options-fs-iommu.err | 1 - .../qemuxml2argvdata/virtio-options-input-iommu.err | 1 - .../virtio-options-memballoon-iommu.err | 1 - tests/qemuxml2argvdata/virtio-options-net-iommu.err | 1 - tests/qemuxml2argvdata/virtio-options-rng-iommu.err | 1 - .../qemuxml2argvdata/virtio-options-video-iommu.err | 1 - tests/qemuxml2argvtest.c | 13 ------------- 9 files changed, 21 deletions(-) delete mode 100644 tests/qemuxml2argvdata/virtio-options-controller-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-disk-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-fs-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-input-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-net-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-rng-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-video-iommu.err diff --git a/tests/qemuxml2argvdata/virtio-options-controller-iommu.err b/tests/qemuxml2argvdata/virtio-options-controller-iommu.err deleted file mode 100644 index 08908544fb..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-controller-iommu.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the iommu setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-disk-iommu.err b/tests/qemuxml2argvdata/virtio-options-disk-iommu.err deleted file mode 100644 index 08908544fb..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-disk-iommu.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the iommu setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-fs-iommu.err b/tests/qemuxml2argvdata/virtio-options-fs-iommu.err deleted file mode 100644 index 08908544fb..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-fs-iommu.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the iommu setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-input-iommu.err b/tests/qemuxml2argvdata/virtio-options-input-iommu.err deleted file mode 100644 index 08908544fb..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-input-iommu.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the iommu setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.err b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.err deleted file mode 100644 index 08908544fb..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the iommu setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-net-iommu.err b/tests/qemuxml2argvdata/virtio-options-net-iommu.err deleted file mode 100644 index 08908544fb..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-net-iommu.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the iommu setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-rng-iommu.err b/tests/qemuxml2argvdata/virtio-options-rng-iommu.err deleted file mode 100644 index 08908544fb..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-rng-iommu.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the iommu setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-video-iommu.err b/tests/qemuxml2argvdata/virtio-options-video-iommu.err deleted file mode 100644 index 08908544fb..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-video-iommu.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the iommu setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6eb77ff884..595bc6e06c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3279,19 +3279,6 @@ mymain(void) DO_TEST_CAPS_LATEST("virtio-options-net-packed"); DO_TEST_CAPS_LATEST("virtio-options-rng-packed"); DO_TEST_CAPS_LATEST("virtio-options-video-packed"); - DO_TEST_PARSE_ERROR("virtio-options-controller-iommu", QEMU_CAPS_VIRTIO_SCSI); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-disk-iommu"); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-fs-iommu"); - DO_TEST_PARSE_ERROR("virtio-options-input-iommu", QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_KEYBOARD); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-net-iommu"); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-memballoon-iommu"); - DO_TEST_PARSE_ERROR("virtio-options-rng-iommu", QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST_PARSE_ERROR("virtio-options-video-iommu", QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_DEVICE_VHOST_USER_GPU); DO_TEST_PARSE_ERROR("virtio-options-controller-ats", QEMU_CAPS_VIRTIO_SCSI); DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-disk-ats"); DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-fs-ats"); -- 2.32.0