From: Andrea Bolognani <abologna@redhat.com>
Date: Tue, 25 Apr 2023 14:30:44 +0000 (+0200)
Subject: meson: Stop looking for QEMU helpers
X-Git-Tag: v9.4.0-rc1~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b134a9bd2a6576095a9bb0ce32d3cd11290f92f3;p=thirdparty%2Flibvirt.git

meson: Stop looking for QEMU helpers

Now that we're performing the lookup at runtime, doing it at
build time is no longer necessary.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/meson.build b/meson.build
index 24f52113fa..6e65e9eec3 100644
--- a/meson.build
+++ b/meson.build
@@ -1655,30 +1655,6 @@ if not get_option('driver_qemu').disabled()
     conf.set_quoted('QEMU_USER', qemu_user)
     conf.set_quoted('QEMU_GROUP', qemu_group)
 
-    qemu_bridge_prog = find_program(
-      'qemu-bridge-helper',
-      dirs: [ '/usr/libexec', '/usr/lib/qemu', '/usr/lib' ],
-      required: false
-    )
-    if qemu_bridge_prog.found()
-      qemu_bridge_path = qemu_bridge_prog.full_path()
-    else
-      qemu_bridge_path = '/usr/libexec/qemu-bridge-helper'
-    endif
-    conf.set_quoted('QEMU_BRIDGE_HELPER', qemu_bridge_path)
-
-    qemu_pr_prog = find_program(
-      'qemu-pr-helper',
-      dirs: [ '/usr/bin', '/usr/libexec' ],
-      required: false
-    )
-    if qemu_pr_prog.found()
-      qemu_pr_path = qemu_pr_prog.full_path()
-    else
-      qemu_pr_path = '/usr/bin/qemu-pr-helper'
-    endif
-    conf.set_quoted('QEMU_PR_HELPER', qemu_pr_path)
-
     qemu_slirp_prog = find_program(
       'slirp-helper',
       dirs: [ '/usr/bin', '/usr/libexec' ],
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index d9460d82e0..c76ae7ac93 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -97,6 +97,10 @@ VIR_ONCE_GLOBAL_INIT(virQEMUConfig);
 #endif
 
 
+#define QEMU_BRIDGE_HELPER "qemu-bridge-helper"
+#define QEMU_PR_HELPER "qemu-pr-helper"
+
+
 virQEMUDriverConfig *virQEMUDriverConfigNew(bool privileged,
                                             const char *root)
 {