Signed-off-by: Akihiko Odaki <akihiko.od...@gmail.com>
---
configure | 1 +
include/net/net.h | 2 +-
meson.build | 1 +
net/tap.c | 6 +++++-
qemu-options.hx | 4 ++--
5 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index a9f746849ec..aa8e096faaa 100755
--- a/configure
+++ b/configure
@@ -5069,6 +5069,7 @@ done
symlink $source_path/ui/icons/qemu.svg
qemu-bundle/share/icons/hicolor/scalable/apps/qemu.svg
symlink ../../pc-bios qemu-bundle/share/qemu
+symlink ../../qemu-bridge-helper qemu-bundle/libexec/qemu-bridge-helper
(for i in $cross_cc_vars; do
export $i
diff --git a/include/net/net.h b/include/net/net.h
index 5d1508081f9..5f701e942b3 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -221,7 +221,7 @@ NetClientState *net_hub_port_find(int hub_id);
#define DEFAULT_NETWORK_SCRIPT CONFIG_SYSCONFDIR "/qemu-ifup"
#define DEFAULT_NETWORK_DOWN_SCRIPT CONFIG_SYSCONFDIR "/qemu-ifdown"
-#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper"
+#define DEFAULT_BUNDLE_BRIDGE_HELPER CONFIG_QEMU_BUNDLE_HELPERDIR
"/qemu-bridge-helper"
#define DEFAULT_BRIDGE_INTERFACE "br0"
void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);
diff --git a/meson.build b/meson.build
index 6d90fe92bf1..ecfc5bd8c72 100644
--- a/meson.build
+++ b/meson.build
@@ -1200,6 +1200,7 @@ config_host_data.set_quoted('CONFIG_QEMU_CONFDIR',
get_option('prefix') / qemu_c
config_host_data.set_quoted('CONFIG_QEMU_BUNDLE_DATADIR', qemu_datadir)
config_host_data.set_quoted('CONFIG_QEMU_DESKTOPDIR', get_option('prefix') /
qemu_desktopdir)
config_host_data.set_quoted('CONFIG_QEMU_FIRMWAREPATH',
get_option('qemu_firmwarepath'))
+config_host_data.set_quoted('CONFIG_QEMU_BUNDLE_HELPERDIR',
get_option('libexecdir'))
config_host_data.set_quoted('CONFIG_QEMU_BUNDLE_ICONDIR', qemu_icondir)
config_host_data.set_quoted('CONFIG_QEMU_LOCALEDIR', get_option('prefix') /
get_option('localedir'))
config_host_data.set_quoted('CONFIG_QEMU_LOCALSTATEDIR', get_option('prefix')
/ get_option('localstatedir'))
diff --git a/net/tap.c b/net/tap.c
index f5686bbf771..be80f29b96b 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -508,7 +508,11 @@ 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_BUNDLE_BRIDGE_HELPER);
+ if (!helper) {
+ error_setg(errp, "birdge helper not found");
+ return -1;
+ }
}
if (socketpair(PF_UNIX, SOCK_STREAM, 0, sv) == -1) {
diff --git a/qemu-options.hx b/qemu-options.hx
index 8965dabc83e..2f40169e8e9 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2528,7 +2528,7 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
" to configure it and 'dfile' (default="
DEFAULT_NETWORK_DOWN_SCRIPT ")\n"
" to deconfigure it\n"
" use '[down]script=no' to disable script execution\n"
- " use network helper 'helper' (default="
DEFAULT_BRIDGE_HELPER ") to\n"
+ " use network helper 'helper' (default="
DEFAULT_BUNDLE_BRIDGE_HELPER ") to\n"
" configure it\n"
" use 'fd=h' to connect to an already opened TAP
interface\n"
" use 'fds=x:y:...:z' to connect to already opened
multiqueue capable TAP interfaces\n"
@@ -2547,7 +2547,7 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
"-netdev bridge,id=str[,br=bridge][,helper=helper]\n"
" configure a host TAP network backend with ID 'str' that
is\n"
" connected to a bridge (default=" DEFAULT_BRIDGE_INTERFACE
")\n"
- " using the program 'helper (default="
DEFAULT_BRIDGE_HELPER ")\n"
+ " using the program 'helper (default="
DEFAULT_BUNDLE_BRIDGE_HELPER ")\n"
#endif
#ifdef __linux__
"-netdev
l2tpv3,id=str,src=srcaddr,dst=dstaddr[,srcport=srcport][,dstport=dstport]\n"
--
2.30.1 (Apple Git-130)
