Detect location of qemu-bridge-helper

RedHat and Debian based distros use different locations

Reference: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790935
(cherry picked from commit 0e4972fe48aeaade393daf089013092a2ecde4b3)

diff --git a/configure.ac b/configure.ac
index 7c2257f2ae5aa87f7bbba7cb08651470a3bc42ae..91ae01add795677bd358cf10ced09e51ea1f3e2c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2523,6 +2523,9 @@ AC_ARG_WITH([qemu-group],
 AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account])
 AC_DEFINE_UNQUOTED([QEMU_GROUP], ["$QEMU_GROUP"], [QEMU group account])
 
+AC_PATH_PROG([QEMU_BRIDGE_HELPER], [qemu-bridge-helper], [/usr/libexec/qemu-bridge-helper],
+                  [/usr/libexec:/usr/lib/qemu])
+AC_DEFINE_UNQUOTED([QEMU_BRIDGE_HELPER], ["$QEMU_BRIDGE_HELPER"], [QEMU bridge helper])
 
 AC_ARG_WITH([macvtap],
   [AS_HELP_STRING([--with-macvtap],

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 29049dc495ad51ba83d2061bf46a4454f0ee68ef..fb52717e32205d06e09adbcc6224588a18df7e0c 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -295,7 +295,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged)
             goto error;
     }
 
-    if (VIR_STRDUP(cfg->bridgeHelperName, "/usr/libexec/qemu-bridge-helper") < 0)
+    if (VIR_STRDUP(cfg->bridgeHelperName, QEMU_BRIDGE_HELPER) < 0)
         goto error;
 
     cfg->clearEmulatorCapabilities = true;