From: Guido Günther <agx@sigxcpu.org>
Date: Thu, 18 Oct 2012 23:14:15 +0000 (+0200)
Subject: qemu: Set arch to i686 if qemu-system-i386 is found
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c324bad93ac7fb7b7db69b3576e58f31dfa94dbd;p=libvirt.git

qemu: Set arch to i686 if qemu-system-i386 is found

If we can't probe the architecture from QMP we parse the architecture
from the qemu binaries name. This results in the architecture being i386
instead of i686 which then results in QEMU_CAPS_PCI_MULTIBUS being unset
which gives a broken qemu command line.

This probably didn't show up earlier since most of the time there's also
a /usr/bin/qemu around which results in i686 capabilities.
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 7c391b32ea..e897f86599 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2055,6 +2055,8 @@ qemuCapsInitHelp(qemuCapsPtr caps)
         /* For historical compat we use 'itanium' as arch name */
         if (STREQ(tmp, "ia64"))
             tmp = "itanium";
+        else if (STREQ(tmp, "i386"))
+            tmp = "i686";
     } else {
         uname_normalize(&ut);
         tmp = ut.machine;