[PATCH 17/21] qemuxml2xmltest: Modernize 'aarch64-gic*' test cases

Use real capabilities for them. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- ...rch64-gic-default-both.aarch64-latest.xml} | 1 + ...aarch64-gic-default-v2.aarch64-latest.xml} | 1 + ...aarch64-gic-default-v3.aarch64-latest.xml} | 1 + ...=> aarch64-gic-default.aarch64-latest.xml} | 1 + .../aarch64-gic-default.xml | 25 ------ ...ml => aarch64-gic-host.aarch64-latest.xml} | 1 + ... aarch64-gic-none-both.aarch64-latest.xml} | 1 + ...> aarch64-gic-none-tcg.aarch64-latest.xml} | 1 + ...=> aarch64-gic-none-v2.aarch64-latest.xml} | 1 + .../aarch64-gic-none-v3.aarch64-latest.xml | 26 ++++++ .../aarch64-gic-none.aarch64-latest.xml | 26 ++++++ ....xml => aarch64-gic-v2.aarch64-latest.xml} | 1 + tests/qemuxml2xmloutdata/aarch64-gic-v2.xml | 25 ------ .../aarch64-gic-v3.aarch64-latest.xml | 26 ++++++ tests/qemuxml2xmloutdata/aarch64-gic-v3.xml | 25 ------ tests/qemuxml2xmltest.c | 84 ++++++++++++++----- 16 files changed, 150 insertions(+), 96 deletions(-) rename tests/qemuxml2xmloutdata/{aarch64-gic-default-both.xml => aarch64-gic-default-both.aarch64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{aarch64-gic-none-v2.xml => aarch64-gic-default-v2.aarch64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{aarch64-gic-none-both.xml => aarch64-gic-default-v3.aarch64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{aarch64-gic-default-v3.xml => aarch64-gic-default.aarch64-latest.xml} (92%) delete mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-default.xml rename tests/qemuxml2xmloutdata/{aarch64-gic-host.xml => aarch64-gic-host.aarch64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{aarch64-gic-none-v3.xml => aarch64-gic-none-both.aarch64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{aarch64-gic-none-tcg.xml => aarch64-gic-none-tcg.aarch64-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{aarch64-gic-default-v2.xml => aarch64-gic-none-v2.aarch64-latest.xml} (92%) create mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-none-v3.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-none.aarch64-latest.xml rename tests/qemuxml2xmloutdata/{aarch64-gic-none.xml => aarch64-gic-v2.aarch64-latest.xml} (92%) delete mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-v2.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-v3.xml diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default-both.aarch64-latest.xml similarity index 92% rename from tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml rename to tests/qemuxml2xmloutdata/aarch64-gic-default-both.aarch64-latest.xml index 247d6025f7..5b2fb7df75 100644 --- a/tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml +++ b/tests/qemuxml2xmloutdata/aarch64-gic-default-both.aarch64-latest.xml @@ -19,6 +19,7 @@ <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pcie-root'/> <audio id='1' type='none'/> <memballoon model='none'/> </devices> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.aarch64-latest.xml similarity index 92% rename from tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml rename to tests/qemuxml2xmloutdata/aarch64-gic-default-v2.aarch64-latest.xml index 474e641ccd..d2148fefa0 100644 --- a/tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml +++ b/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.aarch64-latest.xml @@ -19,6 +19,7 @@ <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pcie-root'/> <audio id='1' type='none'/> <memballoon model='none'/> </devices> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.aarch64-latest.xml similarity index 92% rename from tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml rename to tests/qemuxml2xmloutdata/aarch64-gic-default-v3.aarch64-latest.xml index 247d6025f7..5b2fb7df75 100644 --- a/tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml +++ b/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.aarch64-latest.xml @@ -19,6 +19,7 @@ <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pcie-root'/> <audio id='1' type='none'/> <memballoon model='none'/> </devices> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default.aarch64-latest.xml similarity index 92% rename from tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml rename to tests/qemuxml2xmloutdata/aarch64-gic-default.aarch64-latest.xml index 247d6025f7..5b2fb7df75 100644 --- a/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml +++ b/tests/qemuxml2xmloutdata/aarch64-gic-default.aarch64-latest.xml @@ -19,6 +19,7 @@ <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pcie-root'/> <audio id='1' type='none'/> <memballoon model='none'/> </devices> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default.xml deleted file mode 100644 index 474e641ccd..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-gic-default.xml +++ /dev/null @@ -1,25 +0,0 @@ -<domain type='kvm'> - <name>aarch64test</name> - <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='aarch64' machine='virt'>hvm</type> - <boot dev='hd'/> - </os> - <features> - <gic version='2'/> - </features> - <cpu mode='host-passthrough' check='none'/> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <controller type='usb' index='0' model='none'/> - <audio id='1' type='none'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-host.xml b/tests/qemuxml2xmloutdata/aarch64-gic-host.aarch64-latest.xml similarity index 92% rename from tests/qemuxml2xmloutdata/aarch64-gic-host.xml rename to tests/qemuxml2xmloutdata/aarch64-gic-host.aarch64-latest.xml index 0598473318..eb3b0531cd 100644 --- a/tests/qemuxml2xmloutdata/aarch64-gic-host.xml +++ b/tests/qemuxml2xmloutdata/aarch64-gic-host.aarch64-latest.xml @@ -19,6 +19,7 @@ <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pcie-root'/> <audio id='1' type='none'/> <memballoon model='none'/> </devices> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-both.aarch64-latest.xml similarity index 92% rename from tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml rename to tests/qemuxml2xmloutdata/aarch64-gic-none-both.aarch64-latest.xml index 247d6025f7..5b2fb7df75 100644 --- a/tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml +++ b/tests/qemuxml2xmloutdata/aarch64-gic-none-both.aarch64-latest.xml @@ -19,6 +19,7 @@ <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pcie-root'/> <audio id='1' type='none'/> <memballoon model='none'/> </devices> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.aarch64-latest.xml similarity index 93% rename from tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml rename to tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.aarch64-latest.xml index c71b1cde62..ab274a1ef1 100644 --- a/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml +++ b/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.aarch64-latest.xml @@ -21,6 +21,7 @@ <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pcie-root'/> <audio id='1' type='none'/> <memballoon model='none'/> </devices> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-v2.aarch64-latest.xml similarity index 92% rename from tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml rename to tests/qemuxml2xmloutdata/aarch64-gic-none-v2.aarch64-latest.xml index 474e641ccd..d2148fefa0 100644 --- a/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml +++ b/tests/qemuxml2xmloutdata/aarch64-gic-none-v2.aarch64-latest.xml @@ -19,6 +19,7 @@ <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pcie-root'/> <audio id='1' type='none'/> <memballoon model='none'/> </devices> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-v3.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-v3.aarch64-latest.xml new file mode 100644 index 0000000000..5b2fb7df75 --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-gic-none-v3.aarch64-latest.xml @@ -0,0 +1,26 @@ +<domain type='kvm'> + <name>aarch64test</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='3'/> + </features> + <cpu mode='host-passthrough' check='none'/> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pcie-root'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none.aarch64-latest.xml new file mode 100644 index 0000000000..5b2fb7df75 --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-gic-none.aarch64-latest.xml @@ -0,0 +1,26 @@ +<domain type='kvm'> + <name>aarch64test</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='3'/> + </features> + <cpu mode='host-passthrough' check='none'/> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pcie-root'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none.xml b/tests/qemuxml2xmloutdata/aarch64-gic-v2.aarch64-latest.xml similarity index 92% rename from tests/qemuxml2xmloutdata/aarch64-gic-none.xml rename to tests/qemuxml2xmloutdata/aarch64-gic-v2.aarch64-latest.xml index 474e641ccd..d2148fefa0 100644 --- a/tests/qemuxml2xmloutdata/aarch64-gic-none.xml +++ b/tests/qemuxml2xmloutdata/aarch64-gic-v2.aarch64-latest.xml @@ -19,6 +19,7 @@ <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pcie-root'/> <audio id='1' type='none'/> <memballoon model='none'/> </devices> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-v2.xml b/tests/qemuxml2xmloutdata/aarch64-gic-v2.xml deleted file mode 100644 index 474e641ccd..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-gic-v2.xml +++ /dev/null @@ -1,25 +0,0 @@ -<domain type='kvm'> - <name>aarch64test</name> - <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='aarch64' machine='virt'>hvm</type> - <boot dev='hd'/> - </os> - <features> - <gic version='2'/> - </features> - <cpu mode='host-passthrough' check='none'/> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <controller type='usb' index='0' model='none'/> - <audio id='1' type='none'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml new file mode 100644 index 0000000000..5b2fb7df75 --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml @@ -0,0 +1,26 @@ +<domain type='kvm'> + <name>aarch64test</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='3'/> + </features> + <cpu mode='host-passthrough' check='none'/> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pcie-root'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-v3.xml b/tests/qemuxml2xmloutdata/aarch64-gic-v3.xml deleted file mode 100644 index 247d6025f7..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-gic-v3.xml +++ /dev/null @@ -1,25 +0,0 @@ -<domain type='kvm'> - <name>aarch64test</name> - <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='aarch64' machine='virt'>hvm</type> - <boot dev='hd'/> - </os> - <features> - <gic version='3'/> - </features> - <cpu mode='host-passthrough' check='none'/> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <controller type='usb' index='0' model='none'/> - <audio id='1' type='none'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 23239fdbba..61474ecb0d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -961,27 +961,69 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_VNC); - DO_TEST_FULL("aarch64-gic-none", "", WHEN_BOTH, ARG_GIC, GIC_NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-none-v2", "", WHEN_BOTH, ARG_GIC, GIC_V2, ARG_END); - DO_TEST_FULL("aarch64-gic-none-v3", "", WHEN_BOTH, ARG_GIC, GIC_V3, ARG_END); - DO_TEST_FULL("aarch64-gic-none-both", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, ARG_END); - DO_TEST_FULL("aarch64-gic-none-tcg", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, ARG_END); - DO_TEST_FULL("aarch64-gic-default", "", WHEN_BOTH, ARG_GIC, GIC_NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-default-v2", "", WHEN_BOTH, ARG_GIC, GIC_V2, ARG_END); - DO_TEST_FULL("aarch64-gic-default-v3", "", WHEN_BOTH, ARG_GIC, GIC_V3, ARG_END); - DO_TEST_FULL("aarch64-gic-default-both", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, ARG_END); - DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, ARG_GIC, GIC_NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, ARG_GIC, GIC_V2, ARG_END); - DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, ARG_GIC, GIC_V3, ARG_END); - DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, ARG_END); - DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, ARG_GIC, GIC_NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, ARG_GIC, GIC_V2, ARG_END); - DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, ARG_GIC, GIC_V3, ARG_END); - DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, ARG_END); - DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, ARG_GIC, GIC_NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, ARG_GIC, GIC_V2, ARG_END); - DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, ARG_GIC, GIC_V3, ARG_END); - DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, ARG_END); + DO_TEST_FULL("aarch64-gic-none", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-none-v2", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_V2, ARG_END); + DO_TEST_FULL("aarch64-gic-none-v3", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_V3, ARG_END); + DO_TEST_FULL("aarch64-gic-none-both", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_BOTH, ARG_END); + DO_TEST_FULL("aarch64-gic-none-tcg", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_BOTH, ARG_END); + DO_TEST_FULL("aarch64-gic-default", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-default-v2", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_V2, ARG_END); + DO_TEST_FULL("aarch64-gic-default-v3", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_V3, ARG_END); + DO_TEST_FULL("aarch64-gic-default-both", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_BOTH, ARG_END); + DO_TEST_FULL("aarch64-gic-v2", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-v2", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_V2, ARG_END); + DO_TEST_FULL("aarch64-gic-v2", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_V3, ARG_END); + DO_TEST_FULL("aarch64-gic-v2", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_BOTH, ARG_END); + DO_TEST_FULL("aarch64-gic-v3", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-v3", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_V2, ARG_END); + DO_TEST_FULL("aarch64-gic-v3", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_V3, ARG_END); + DO_TEST_FULL("aarch64-gic-v3", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_BOTH, ARG_END); + DO_TEST_FULL("aarch64-gic-host", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-host", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_V2, ARG_END); + DO_TEST_FULL("aarch64-gic-host", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_V3, ARG_END); + DO_TEST_FULL("aarch64-gic-host", ".aarch64-latest", WHEN_BOTH, + ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", + ARG_GIC, GIC_BOTH, ARG_END); /* SVE aarch64 CPU features work on modern QEMU */ DO_TEST_CAPS_ARCH_LATEST("aarch64-features-sve", "aarch64"); -- 2.39.2