From 0a810b4a1677a1c984dbe17a9bad47d4802f473c Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 4 Jan 2022 16:10:31 +0100 Subject: [PATCH] testutilsqemu: Remove unused non-x86 fake machine types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For tests with fake capabilities we fill in a bunch of machine types which the tests might use. For now there's a random collection of machine types which are not actually used. Purge the unused ones for non-x86 machines. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- tests/testutilsqemu.c | 12 +++++------- tests/vircapstest.c | 6 ------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 7fdb82daec..980555b27e 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -58,27 +58,25 @@ static const char *const aarch64_machines[] = { "virt", "virt-2.6", "versatilepb", NULL }; static const char *const arm_machines[] = { - "vexpress-a9", "vexpress-a15", "versatilepb", "virt", NULL + "vexpress-a9", "virt", NULL }; static const char *const ppc64_machines[] = { "pseries", NULL }; static const char *const ppc_machines[] = { - "g3beige", "mac99", "prep", "ppce500", NULL + "ppce500", NULL }; static const char *const riscv32_machines[] = { - "spike_v1.10", "spike_v1.9.1", "sifive_e", "virt", "sifive_u", NULL + "virt", NULL }; static const char *const riscv64_machines[] = { - "spike_v1.10", "spike_v1.9.1", "sifive_e", "virt", "sifive_u", NULL + "virt", NULL }; static const char *const s390x_machines[] = { "s390-ccw-virtio", NULL }; static const char *const sparc_machines[] = { - "SS-5", "LX", "SPARCClassic", "SPARCbook", - "SS-10", "SS-20", "SS-4", "SS-600MP", - "Voyager", "leon3_generic", NULL + "SS-5", NULL }; static const char *const *qemu_machines[VIR_ARCH_LAST] = { diff --git a/tests/vircapstest.c b/tests/vircapstest.c index 697803fdc9..be93325307 100644 --- a/tests/vircapstest.c +++ b/tests/vircapstest.c @@ -165,12 +165,6 @@ test_virCapsDomainDataLookupQEMU(const void *data G_GNUC_UNUSED) CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, "/usr/bin/qemu-system-ppc64", NULL, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64, VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-ppc64", "pseries"); - CAPSCOMP(-1, VIR_ARCH_RISCV32, VIR_DOMAIN_VIRT_NONE, NULL, NULL, - VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_RISCV32, - VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-riscv32", "spike_v1.10"); - CAPSCOMP(-1, VIR_ARCH_RISCV64, VIR_DOMAIN_VIRT_NONE, NULL, NULL, - VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_RISCV64, - VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-riscv64", "spike_v1.10"); CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, "pseries", VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64,