[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 6/6] net: Use bundle mechanism
From: |
Akihiko Odaki |
Subject: |
[PATCH v7 6/6] net: Use bundle mechanism |
Date: |
Thu, 16 Jun 2022 02:33:45 +0900 |
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
---
meson.build | 2 ++
net/tap.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 8961df266d1..5e0e08801c9 100644
--- a/meson.build
+++ b/meson.build
@@ -3574,6 +3574,8 @@ if have_tools
dependencies: [authz, crypto, io, qom, qemuutil,
libcap_ng, mpathpersist],
install: true)
+
+ bundles += { get_option('libexecdir') / 'qemu-bridge-helper':
'../../qemu-bridge-helper' }
endif
if have_ivshmem
diff --git a/net/tap.c b/net/tap.c
index b3ddfd4a74b..5beba85fb22 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -507,7 +507,7 @@ static int net_bridge_run_helper(const char *helper, const
char *bridge,
sigprocmask(SIG_BLOCK, &mask, &oldmask);
if (!helper) {
- helper = default_helper = get_relocated_path(DEFAULT_BRIDGE_HELPER);
+ helper = default_helper = find_bundle(DEFAULT_BRIDGE_HELPER);
}
if (socketpair(PF_UNIX, SOCK_STREAM, 0, sv) == -1) {
--
2.32.1 (Apple Git-133)
- [PATCH v7 0/6] cutils: Introduce bundle mechanism, Akihiko Odaki, 2022/06/15
- [PATCH v7 2/6] Remove prefixes from path configuration macros, Akihiko Odaki, 2022/06/15
- [PATCH v7 1/6] qga: Relocate a path emitted in the help text, Akihiko Odaki, 2022/06/15
- [PATCH v7 3/6] cutils: Introduce bundle mechanism, Akihiko Odaki, 2022/06/15
- [PATCH v7 4/6] datadir: Use bundle mechanism, Akihiko Odaki, 2022/06/15
- [PATCH v7 5/6] ui/icons: Use bundle mechanism, Akihiko Odaki, 2022/06/15
- [PATCH v7 6/6] net: Use bundle mechanism,
Akihiko Odaki <=
- Re: [PATCH v7 0/6] cutils: Introduce bundle mechanism, Paolo Bonzini, 2022/06/15