[PATCH 31/31] testutilsqemu: Drop fake capability testing infrastructure for 'ppc64'

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxx>
---
 tests/testutilsqemu.c | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 0d7892353c..bd3de1e786 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -30,14 +30,9 @@ 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_PPC64] = "/usr/bin/qemu-system-ppc64",
     [VIR_ARCH_S390X] = "/usr/bin/qemu-system-s390x",
 };

-static const virArch arch_alias[VIR_ARCH_LAST] = {
-    [VIR_ARCH_PPC64LE] = VIR_ARCH_PPC64,
-};
-
 static const char *const i386_machines[] = {
     "pc", NULL
 };
@@ -48,9 +43,6 @@ static const char *const x86_64_machines[] = {
 static const char *const aarch64_machines[] = {
     "virt", "virt-2.6", "versatilepb", NULL
 };
-static const char *const ppc64_machines[] = {
-    "pseries", NULL
-};
 static const char *const s390x_machines[] = {
     "s390-ccw-virtio", NULL
 };
@@ -59,7 +51,6 @@ 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_PPC64] = ppc64_machines,
     [VIR_ARCH_S390X] = s390x_machines,
 };

@@ -67,7 +58,6 @@ 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_PPC64] = "ppc_spapr.ram",
     [VIR_ARCH_S390X] = "s390.ram",
 };

@@ -164,9 +154,6 @@ testQemuAddGuest(virCaps *caps,
     virCapsGuest *guest;
     virArch emu_arch = arch;

-    if (arch_alias[arch] != VIR_ARCH_NONE)
-        emu_arch = arch_alias[arch];
-
     if (qemu_emulators[emu_arch] == NULL)
         return 0;

@@ -412,9 +399,6 @@ qemuTestCapsCacheInsert(virFileCache *cache,
             g_autoptr(virQEMUCaps) copyCaps = NULL;
             virQEMUCaps *effCaps = caps;

-            if (arch_alias[arch] != VIR_ARCH_NONE)
-                arch = arch_alias[arch];
-
             if (qemu_emulators[arch]) {
                 /* if we are dealing with fake caps we need to populate machine types */
                 if (!virQEMUCapsHasMachines(caps)) {
-- 
2.39.2




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux