From: Daniel P. Berrangé <berrange@redhat.com>
Date: Thu, 31 Jan 2019 13:18:39 +0000 (+0000)
Subject: qemu: remove check for 'qemu' binary
X-Git-Tag: v5.1.0-rc1~299
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bb582bff87a8a23ccacf0f57776bf6ba51165da;p=thirdparty%2Flibvirt.git

qemu: remove check for 'qemu' binary

The 'qemu' binary used to provide the i386 emulator until it was renamed
to qemu-system-i386 in QEMU 1.0. Since we don't support such old
versions we don't need to check for 'qemu' when probing capabilities.

Reviewed-by: Erik Skultety <eskultet@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f504db7d05..5cf4b617c6 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -744,12 +744,6 @@ virQEMUCapsFindBinaryForArch(virArch hostarch,
             goto out;
     }
 
-    /* Third attempt, i686 only: try 'qemu' */
-    if (guestarch == VIR_ARCH_I686) {
-        if ((ret = virQEMUCapsFindBinary("%s", "qemu")) != NULL)
-            goto out;
-    }
-
  out:
     return ret;
 }