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

[PATCH] qemu: Look for qemu-bridge-helper in more directories

Posted by Andrea Bolognani 9 months, 2 weeks ago

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>
---
 src/hypervisor/domain_interface.c | 1 +
 1 file changed, 1 insertion(+)

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",
-- 
2.46.1

Re: [PATCH] qemu: Look for qemu-bridge-helper in more directories

Posted by Martin Kletzander 9 months, 2 weeks ago

On Fri, Sep 27, 2024 at 03:21:17PM +0200, Andrea Bolognani wrote:
>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>

and safe for freeze.

>---
> src/hypervisor/domain_interface.c | 1 +
> 1 file changed, 1 insertion(+)
>
>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",
>-- 
>2.46.1
>