From: Andrea Bolognani <abologna@redhat.com>
Date: Fri, 27 Sep 2024 12:47:21 +0000 (+0200)
Subject: qemu: Look for qemu-bridge-helper in more directories
X-Git-Tag: v10.8.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55c3c09197f3463e8d470f07ffb388e0ac0049d3;p=thirdparty%2Flibvirt.git

qemu: Look for qemu-bridge-helper in more directories

Commit 0caacf47d7b423db9126660fb0382ed56cd077c1 recently
made it so the new path used for qemu-bridge-helper in Debian
would be allowed, but the logic used to actually figure out
the complete path for the helper was not updated accordingly.

https://bugs.debian.org/1082530

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

diff --git a/src/hypervisor/domain_interface.c b/src/hypervisor/domain_interface.c
index 5cdba279fa..5bc698d272 100644
--- a/src/hypervisor/domain_interface.c
+++ b/src/hypervisor/domain_interface.c
@@ -541,6 +541,7 @@ virDomainCreateInBridgePortWithHelper(const char *bridgeHelperName,
                                       unsigned int flags)
 {
     const char *const bridgeHelperDirs[] = {
+        "/usr/libexec/qemu",
         "/usr/libexec",
         "/usr/lib/qemu",
         "/usr/lib",