[PATCH 7/7] testutilsqemu: Drop fake capability testing infrastructure for 's390'

Peter Krempa pkrempa at redhat.com
Fri Mar 31 10:30:44 UTC 2023


Now that all tests were converted to use real capabilities we don't need
it any more. Remove it so that no new tests are added with it.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 tests/testutilsqemu.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index bd3de1e786..f3199755f6 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -30,7 +30,6 @@ static const char *qemu_emulators[VIR_ARCH_LAST] = {
     [VIR_ARCH_I686] = "/usr/bin/qemu-system-i386",
     [VIR_ARCH_X86_64] = "/usr/bin/qemu-system-x86_64",
     [VIR_ARCH_AARCH64] = "/usr/bin/qemu-system-aarch64",
-    [VIR_ARCH_S390X] = "/usr/bin/qemu-system-s390x",
 };

 static const char *const i386_machines[] = {
@@ -43,22 +42,17 @@ static const char *const x86_64_machines[] = {
 static const char *const aarch64_machines[] = {
     "virt", "virt-2.6", "versatilepb", NULL
 };
-static const char *const s390x_machines[] = {
-    "s390-ccw-virtio", NULL
-};

 static const char *const *qemu_machines[VIR_ARCH_LAST] = {
     [VIR_ARCH_I686] = i386_machines,
     [VIR_ARCH_X86_64] = x86_64_machines,
     [VIR_ARCH_AARCH64] = aarch64_machines,
-    [VIR_ARCH_S390X] = s390x_machines,
 };

 static const char *qemu_default_ram_id[VIR_ARCH_LAST] = {
     [VIR_ARCH_I686] = "pc.ram",
     [VIR_ARCH_X86_64] = "pc.ram",
     [VIR_ARCH_AARCH64] = "mach-virt.ram",
-    [VIR_ARCH_S390X] = "s390.ram",
 };

 char *
-- 
2.39.2



More information about the libvir-list mailing list