From 161a341850c70f41aef81bec15b52a360f10339e Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Wed, 3 Feb 2016 16:58:20 +0100 Subject: [PATCH] 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. --- ....args => qemuxml2argv-aarch64-gic-v2.args} | 13 +++----- .../qemuxml2argv-aarch64-gic-v2.xml} | 14 ++------ ....args => qemuxml2argv-aarch64-gic-v3.args} | 12 +++---- .../qemuxml2argv-aarch64-gic-v3.xml} | 14 ++------ .../qemuxml2argv-aarch64-gic.xml | 32 ------------------- .../qemuxml2argv-aarch64-gicv3.xml | 32 ------------------- tests/qemuxml2argvtest.c | 13 ++++---- .../qemuxml2xmlout-aarch64-gic-v2.xml | 1 + .../qemuxml2xmlout-aarch64-gic-v3.xml | 1 + tests/qemuxml2xmltest.c | 4 +-- 10 files changed, 23 insertions(+), 113 deletions(-) rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gic.args => qemuxml2argv-aarch64-gic-v2.args} (57%) rename tests/{qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic.xml => qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.xml} (61%) rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-gicv3.args => qemuxml2argv-aarch64-gic-v3.args} (55%) rename tests/{qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gicv3.xml => qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.xml} (61%) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v2.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v3.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args similarity index 57% rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args rename to tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args index be19ea4e16..d30f4493b2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args +++ b/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 \ --no-kvm \ --cpu cortex-a53 \ +-machine virt,accel=kvm \ +-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 \ --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 +-usb diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.xml similarity index 61% rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic.xml rename to tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.xml index cb595e4a7a..9ccba99042 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.xml @@ -1,4 +1,4 @@ - + aarch64test 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f 1048576 @@ -6,27 +6,17 @@ 1 hvm - /aarch64.kernel - /aarch64.initrd - console=ttyAMA0 - - - cortex-a53 - + destroy restart destroy /usr/bin/qemu-system-aarch64 - - - - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args similarity index 55% rename from tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args rename to tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args index a3530bbc0d..9cd86acc67 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args +++ b/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 \ --cpu cortex-a53 \ +-machine virt,accel=kvm,gic-version=3 \ +-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 \ --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 +-usb diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gicv3.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.xml similarity index 61% rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gicv3.xml rename to tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.xml index 72aaaf7fe5..7c9ee92b39 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gicv3.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.xml @@ -1,4 +1,4 @@ - + aarch64test 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f 1048576 @@ -6,27 +6,17 @@ 1 hvm - /aarch64.kernel - /aarch64.initrd - console=ttyAMA0 - - - cortex-a53 - + destroy restart destroy /usr/bin/qemu-system-aarch64 - - - - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.xml deleted file mode 100644 index cb595e4a7a..0000000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.xml +++ /dev/null @@ -1,32 +0,0 @@ - - aarch64test - 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f - 1048576 - 1048576 - 1 - - hvm - /aarch64.kernel - /aarch64.initrd - console=ttyAMA0 - - - - - - - - cortex-a53 - - - destroy - restart - destroy - - /usr/bin/qemu-system-aarch64 - - - - - - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.xml deleted file mode 100644 index 72aaaf7fe5..0000000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.xml +++ /dev/null @@ -1,32 +0,0 @@ - - aarch64test - 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f - 1048576 - 1048576 - 1 - - hvm - /aarch64.kernel - /aarch64.initrd - console=ttyAMA0 - - - - - - - - cortex-a53 - - - destroy - restart - destroy - - /usr/bin/qemu-system-aarch64 - - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3c7693bf25..360ba25c79 100644 --- a/tests/qemuxml2argvtest.c +++ b/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", - QEMU_CAPS_KVM); - DO_TEST("aarch64-gicv3", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, + DO_TEST("aarch64-gic-v2", + QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_CPU_HOST, QEMU_CAPS_MACH_VIRT_GIC_VERSION); - DO_TEST_FAILURE("aarch64-gicv3", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT); + DO_TEST("aarch64-gic-v3", + 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", diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v2.xml new file mode 120000 index 0000000000..80a01c2185 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v2.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v3.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v3.xml new file mode 120000 index 0000000000..f586fa1954 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v3.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index d9550ccee8..b13e2bd95d 100644 --- a/tests/qemuxml2xmltest.c +++ b/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-gicv3"); + DO_TEST("aarch64-gic-v2"); + DO_TEST("aarch64-gic-v3"); DO_TEST("memory-hotplug"); DO_TEST("memory-hotplug-nonuma"); -- GitLab