]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Fix virQEMUCapsFindTarget on ppc64le
authorJiri Denemark <jdenemar@redhat.com>
Tue, 13 Dec 2016 15:58:41 +0000 (16:58 +0100)
committerJiri Denemark <jdenemar@redhat.com>
Tue, 13 Dec 2016 21:11:33 +0000 (22:11 +0100)
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>
src/qemu/qemu_capabilities.c

index 081afc5665e1d89b67933af28325741f154e90da..f4ca84e982b7a26f0be27b4b1500cecea1cba84b 100644 (file)
@@ -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;
 }