QEMU_CAPS_MACH_VIRT_GIC_VERSION will be assumed for all aarch64 machines starting from next commit, so this test will become invalid. Remove it. Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx> Reviewed-by: Pavel Hrdina <phrdina@xxxxxxxxxx> Reviewed-by: Neal Gompa <ngompa13@xxxxxxxxx> --- tests/qemuxml2argvdata/aarch64-gic-host.err | 1 - tests/qemuxml2argvdata/aarch64-gic-v3.err | 1 - tests/qemuxml2argvtest.c | 4 ---- 3 files changed, 6 deletions(-) delete mode 100644 tests/qemuxml2argvdata/aarch64-gic-host.err delete mode 100644 tests/qemuxml2argvdata/aarch64-gic-v3.err diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.err b/tests/qemuxml2argvdata/aarch64-gic-host.err deleted file mode 100644 index 448d5da391..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-host.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: gic-version option is not available with this QEMU binary diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.err b/tests/qemuxml2argvdata/aarch64-gic-v3.err deleted file mode 100644 index 448d5da391..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-v3.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: gic-version option is not available with this QEMU binary diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c1c68cdf1f..6d0a15d408 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3049,8 +3049,6 @@ mymain(void) DO_TEST_GIC("aarch64-gic-v2", GIC_BOTH, QEMU_CAPS_KVM, QEMU_CAPS_MACH_VIRT_GIC_VERSION); - DO_TEST_FAILURE("aarch64-gic-v3", - QEMU_CAPS_KVM, NONE); DO_TEST_GIC("aarch64-gic-v3", GIC_NONE, QEMU_CAPS_KVM, QEMU_CAPS_MACH_VIRT_GIC_VERSION); @@ -3063,8 +3061,6 @@ mymain(void) DO_TEST_GIC("aarch64-gic-v3", GIC_BOTH, QEMU_CAPS_KVM, QEMU_CAPS_MACH_VIRT_GIC_VERSION); - DO_TEST_FAILURE("aarch64-gic-host", - QEMU_CAPS_KVM, NONE); DO_TEST_GIC("aarch64-gic-host", GIC_NONE, QEMU_CAPS_KVM, QEMU_CAPS_MACH_VIRT_GIC_VERSION); -- 2.30.2