External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change string form of VIR_ARCH_ITANIUM back to ia64

Browse Source 
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
This commit is contained in:
Daniel P. Berrange 2012-12-19 10:54:57 +00:00
parent 1c212145a3
commit 012ff583fe
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_capabilities.c
View File

@ -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";

4
src/util/virarch.c
View File

@ -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 {