tests: Reorganize and simplify GIC test cases

Unify the naming to prepare for new test cases that will be added
later on.

Convert a couple of output XML files for the qemuxml2xml test to
symlinks while at it, since they were identical to the corresponding
input XML files anyways.

Moreover, since we're only interested in testing GIC support here,
simplify XML files by getting rid of the unrelevant bits.

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

@@ -7,19 +7,14 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name aarch64test \
 -S \
--M virt \
+-machine virt,accel=kvm \
--no-kvm \
+-cpu host \
--cpu cortex-a53 \
 -m 1024 \
 -smp 1 \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
 -nographic \
 -nodefaults \
 -monitor unix:/tmp/test-monitor,server,nowait \
+-no-acpi \
 -boot c \
--kernel /aarch64.kernel \
+-usb
--initrd /aarch64.initrd \
--append console=ttyAMA0 \
--usb \
--net nic,macaddr=52:54:00:09:a4:37,vlan=0,model=virtio,name=net0 \
--net user,vlan=0,name=hostnet0

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

@@ -1,4 +1,4 @@
-<domain type='qemu'>
+<domain type='kvm'>
   <name>aarch64test</name>
   <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
   <memory unit='KiB'>1048576</memory>
@@ -6,27 +6,17 @@
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='aarch64' machine='virt'>hvm</type>
-    <kernel>/aarch64.kernel</kernel>
-    <initrd>/aarch64.initrd</initrd>
-    <cmdline>console=ttyAMA0</cmdline>
     <boot dev='hd'/>
   </os>
   <features>
-    <acpi/>
     <gic version='2'/>
   </features>
-  <cpu mode='custom' match='exact'>
+  <cpu mode='host-passthrough'/>
-    <model fallback='allow'>cortex-a53</model>
-  </cpu>
   <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>
-    <interface type='user'>
-      <mac address='52:54:00:09:a4:37'/>
-      <model type='virtio'/>
-    </interface>
   </devices>
 </domain>

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

@@ -7,18 +7,14 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name aarch64test \
 -S \
--machine virt,accel=tcg,gic-version=3 \
+-machine virt,accel=kvm,gic-version=3 \
--cpu cortex-a53 \
+-cpu host \
 -m 1024 \
 -smp 1 \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
 -nographic \
 -nodefaults \
 -monitor unix:/tmp/test-monitor,server,nowait \
+-no-acpi \
 -boot c \
--kernel /aarch64.kernel \
+-usb
--initrd /aarch64.initrd \
--append console=ttyAMA0 \
--usb \
--net nic,macaddr=52:54:00:09:a4:37,vlan=0,model=virtio,name=net0 \
--net user,vlan=0,name=hostnet0

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

@@ -1,4 +1,4 @@
-<domain type='qemu'>
+<domain type='kvm'>
   <name>aarch64test</name>
   <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
   <memory unit='KiB'>1048576</memory>
@@ -6,27 +6,17 @@
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='aarch64' machine='virt'>hvm</type>
-    <kernel>/aarch64.kernel</kernel>
-    <initrd>/aarch64.initrd</initrd>
-    <cmdline>console=ttyAMA0</cmdline>
     <boot dev='hd'/>
   </os>
   <features>
-    <acpi/>
     <gic version='3'/>
   </features>
-  <cpu mode='custom' match='exact'>
+  <cpu mode='host-passthrough'/>
-    <model fallback='allow'>cortex-a53</model>
-  </cpu>
   <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>
-    <interface type='user'>
-      <mac address='52:54:00:09:a4:37'/>
-      <model type='virtio'/>
-    </interface>
   </devices>
 </domain>

tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.xml

@@ -1,32 +0,0 @@
-<domain type='qemu'>
-  <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>
-    <kernel>/aarch64.kernel</kernel>
-    <initrd>/aarch64.initrd</initrd>
-    <cmdline>console=ttyAMA0</cmdline>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <gic version='2'/>
-  </features>
-  <cpu mode='custom' match='exact'>
-    <model fallback='allow'>cortex-a53</model>
-  </cpu>
-  <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>
-    <interface type='user'>
-      <mac address='52:54:00:09:a4:37'/>
-      <model type='virtio'/>
-    </interface>
-  </devices>
-</domain>

tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.xml

@@ -1,32 +0,0 @@
-<domain type='qemu'>
-  <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>
-    <kernel>/aarch64.kernel</kernel>
-    <initrd>/aarch64.initrd</initrd>
-    <cmdline>console=ttyAMA0</cmdline>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <gic version='3'/>
-  </features>
-  <cpu mode='custom' match='exact'>
-    <model fallback='allow'>cortex-a53</model>
-  </cpu>
-  <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>
-    <interface type='user'>
-      <mac address='52:54:00:09:a4:37'/>
-      <model type='virtio'/>
-    </interface>
-  </devices>
-</domain>

tests/qemuxml2argvtest.c

@@ -1679,13 +1679,14 @@ mymain(void)
     DO_TEST("aarch64-cpu-passthrough",
             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO,
             QEMU_CAPS_CPU_HOST, QEMU_CAPS_KVM);
-    DO_TEST("aarch64-gic",
+    DO_TEST("aarch64-gic-v2",
-            QEMU_CAPS_KVM);
+            QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST,
-    DO_TEST("aarch64-gicv3",
-            QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-    DO_TEST_FAILURE("aarch64-gicv3",
+    DO_TEST("aarch64-gic-v3",
-            QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT);
+            QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST,
+            QEMU_CAPS_MACH_VIRT_GIC_VERSION);
+    DO_TEST_FAILURE("aarch64-gic-v3",
+            QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST);
 
     driver.caps->host.cpu->arch = VIR_ARCH_AARCH64;
     DO_TEST("aarch64-kvm-32-on-64",

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

@@ -0,0 +1 @@
+../qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.xml

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

@@ -0,0 +1 @@
+../qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.xml

tests/qemuxml2xmltest.c

@@ -737,8 +737,8 @@ mymain(void)
             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
             QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_VIRTIO_SCSI);
-    DO_TEST("aarch64-gic");
+    DO_TEST("aarch64-gic-v2");
-    DO_TEST("aarch64-gicv3");
+    DO_TEST("aarch64-gic-v3");
 
     DO_TEST("memory-hotplug");
     DO_TEST("memory-hotplug-nonuma");