Change string form of VIR_ARCH_ITANIUM back to ia64

Historically there was an inconsistency in handling of the
itanium arch. The xen driver & CPU model code treated it
as 'ia64' but the QEMU capabilities code used 'itanium'. On
the grounds that no one has ever seriously used  itanium
with QEMU, while RHEL shipped itanium with Xen, we should
favour 'ia64' as the canonical format

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ae75bc62a9ec431c8b5a52a2f610b5fb633be64b..50d999a719a8a3865b9e1e92ca379408341670d4 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -251,8 +251,6 @@ VIR_ONCE_GLOBAL_INIT(qemuCaps)
 
 static virArch qemuCapsArchFromString(const char *arch)
 {
-    if (STREQ(arch, "ia64"))
-        return VIR_ARCH_ITANIUM;
     if (STREQ(arch, "i386"))
         return VIR_ARCH_I686;
     if (STREQ(arch, "arm"))
@@ -266,8 +264,6 @@ static const char *qemuCapsArchToString(virArch arch)
 {
     if (arch == VIR_ARCH_I686)
         return "i386";
-    else if (arch == VIR_ARCH_ITANIUM)
-        return "ia64";
     else if (arch == VIR_ARCH_ARMV7L)
         return "arm";
 

diff --git a/src/util/virarch.c b/src/util/virarch.c
index 5458b743144462322d3613153633b33d267f9747..1376887577df595f7679cc056d3abe9db6ec9b20 100644 (file)
--- a/src/util/virarch.c
+++ b/src/util/virarch.c
@@ -39,7 +39,7 @@ static const struct virArchData {
     { "cris",         32, VIR_ARCH_LITTLE_ENDIAN },
     { "i686",         32, VIR_ARCH_LITTLE_ENDIAN },
 
-    { "itanium",      64, VIR_ARCH_LITTLE_ENDIAN },
+    { "ia64",         64, VIR_ARCH_LITTLE_ENDIAN },
     { "lm32",         32, VIR_ARCH_BIG_ENDIAN },
     { "m68k",         32, VIR_ARCH_BIG_ENDIAN },
     { "microblaze",   32, VIR_ARCH_BIG_ENDIAN },
@@ -159,8 +159,6 @@ virArch virArchFromHost(void)
         ut.machine[3] == '6' &&
         ut.machine[4] == '\0') {
         arch = VIR_ARCH_I686;
-    } else if (STREQ(ut.machine, "ia64")) {
-        arch = VIR_ARCH_ITANIUM;
     } else if (STREQ(ut.machine, "amd64")) {
         arch = VIR_ARCH_X86_64;
     } else {