From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 13 Dec 2016 15:58:41 +0000 (+0100)
Subject: qemu: Fix virQEMUCapsFindTarget on ppc64le
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f00c00475fba4bc876e549088ec971bdce28a38b;p=libvirt.git

qemu: Fix virQEMUCapsFindTarget on ppc64le

virQEMUCapsFindTarget is supposed to find an alternative QEMU binary if
qemu-system-$GUEST_ARCH doesn't exist. The alternative is using host
architecture when it is compatible with $GUEST_ARCH. But a special
treatment has to be applied for ppc64le since the QEMU binary is always
called qemu-system-ppc64.

Broken by me in v2.2.0-171-gf2e71550d.

https://bugzilla.redhat.com/show_bug.cgi?id=1403745

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 081afc5665..f4ca84e982 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -482,13 +482,13 @@ static virArch
 virQEMUCapsFindTarget(virArch hostarch,
                       virArch guestarch)
 {
+    if (virQEMUCapsGuestIsNative(hostarch, guestarch))
+        guestarch = hostarch;
+
     /* Both ppc64 and ppc64le guests can use the ppc64 target */
     if (ARCH_IS_PPC64(guestarch))
         guestarch = VIR_ARCH_PPC64;
 
-    if (virQEMUCapsGuestIsNative(hostarch, guestarch))
-        guestarch = hostarch;
-
     return guestarch;
 }