tests: Improve GIC tests

Account for the fact that the default might change based on what
GIC versions are supported by QEMU. That's not the case at the
moment, but it will be soon.
Signed-off-by: NAndrea Bolognani <abologna@redhat.com>
Reviewed-by: NJohn Ferlan <jferlan@redhat.com>

tests/qemuxml2argvdata/aarch64-gic-default-both.args

+aarch64-gic-v2.args
\ No newline at end of file

tests/qemuxml2argvdata/aarch64-gic-default-both.xml

+aarch64-gic-default.xml
\ No newline at end of file

tests/qemuxml2argvdata/aarch64-gic-default-v2.args

+aarch64-gic-v2.args
\ No newline at end of file

tests/qemuxml2argvdata/aarch64-gic-default-v2.xml

+aarch64-gic-default.xml
\ No newline at end of file

tests/qemuxml2argvdata/aarch64-gic-default-v3.args

+aarch64-gic-v2.args
\ No newline at end of file

tests/qemuxml2argvdata/aarch64-gic-default-v3.xml

+aarch64-gic-default.xml
\ No newline at end of file

tests/qemuxml2argvtest.c

@@ -2606,13 +2606,13 @@ mymain(void)
     DO_TEST_GIC("aarch64-gic-default", GIC_NONE,
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-    DO_TEST_GIC("aarch64-gic-default", GIC_V2,
+    DO_TEST_GIC("aarch64-gic-default-v2", GIC_V2,
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-    DO_TEST_GIC("aarch64-gic-default", GIC_V3,
+    DO_TEST_GIC("aarch64-gic-default-v3", GIC_V3,
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-    DO_TEST_GIC("aarch64-gic-default", GIC_BOTH,
+    DO_TEST_GIC("aarch64-gic-default-both", GIC_BOTH,
             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACH_VIRT_GIC_VERSION);
     DO_TEST_GIC("aarch64-gic-v2", GIC_NONE,

tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml

+../qemuxml2argvdata/aarch64-gic-v2.xml
\ No newline at end of file

tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml

+../qemuxml2argvdata/aarch64-gic-v2.xml
\ No newline at end of file

tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml

+../qemuxml2argvdata/aarch64-gic-v2.xml
\ No newline at end of file

tests/qemuxml2xmltest.c

@@ -1265,9 +1265,9 @@ mymain(void)
     DO_TEST_FULL("aarch64-gic-none-both", WHEN_BOTH, GIC_BOTH, NONE);
     DO_TEST_FULL("aarch64-gic-none-tcg", WHEN_BOTH, GIC_BOTH, NONE);
     DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_NONE, NONE);
-    DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_V2, NONE);
-    DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_V3, NONE);
-    DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_BOTH, NONE);
+    DO_TEST_FULL("aarch64-gic-default-v2", WHEN_BOTH, GIC_V2, NONE);
+    DO_TEST_FULL("aarch64-gic-default-v3", WHEN_BOTH, GIC_V3, NONE);
+    DO_TEST_FULL("aarch64-gic-default-both", WHEN_BOTH, GIC_BOTH, NONE);
     DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_NONE, NONE);
     DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_V2, NONE);
     DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_V3, NONE);