aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-08-18 11:56:16 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2020-09-30 19:11:36 +0200
commit63c4db4c2e6d221cecb5aafa365934bb05724cb4 (patch)
tree070aeb7efe0ec550a8c6d85ae156949952b477aa /net
parent1b934064817e3bc7c7e6b4a4af57b9ab685093e2 (diff)
downloadqemu-63c4db4c2e6d221cecb5aafa365934bb05724cb4.zip
qemu-63c4db4c2e6d221cecb5aafa365934bb05724cb4.tar.gz
qemu-63c4db4c2e6d221cecb5aafa365934bb05724cb4.tar.bz2
net: relocate paths to helpers and scripts
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'net')
-rw-r--r--net/tap.c26
1 files changed, 19 insertions, 7 deletions
diff --git a/net/tap.c b/net/tap.c
index 14dc904..04ce72d 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -478,6 +478,7 @@ static int net_bridge_run_helper(const char *helper, const char *bridge,
Error **errp)
{
sigset_t oldmask, mask;
+ g_autofree char *default_helper = NULL;
int pid, status;
char *args[5];
char **parg;
@@ -487,6 +488,10 @@ static int net_bridge_run_helper(const char *helper, const char *bridge,
sigaddset(&mask, SIGCHLD);
sigprocmask(SIG_BLOCK, &mask, &oldmask);
+ if (!helper) {
+ helper = default_helper = get_relocated_path(DEFAULT_BRIDGE_HELPER);
+ }
+
if (socketpair(PF_UNIX, SOCK_STREAM, 0, sv) == -1) {
error_setg_errno(errp, errno, "socketpair() failed");
return -1;
@@ -588,8 +593,7 @@ int net_init_bridge(const Netdev *netdev, const char *name,
assert(netdev->type == NET_CLIENT_DRIVER_BRIDGE);
bridge = &netdev->u.bridge;
-
- helper = bridge->has_helper ? bridge->helper : DEFAULT_BRIDGE_HELPER;
+ helper = bridge->has_helper ? bridge->helper : NULL;
br = bridge->has_br ? bridge->br : DEFAULT_BRIDGE_INTERFACE;
fd = net_bridge_run_helper(helper, br, errp);
@@ -773,8 +777,8 @@ int net_init_tap(const Netdev *netdev, const char *name,
const NetdevTapOptions *tap;
int fd, vnet_hdr = 0, i = 0, queues;
/* for the no-fd, no-helper case */
- const char *script = NULL; /* suppress wrong "uninit'd use" gcc warning */
- const char *downscript = NULL;
+ const char *script;
+ const char *downscript;
Error *err = NULL;
const char *vhostfdname;
char ifname[128];
@@ -784,6 +788,8 @@ int net_init_tap(const Netdev *netdev, const char *name,
tap = &netdev->u.tap;
queues = tap->has_queues ? tap->queues : 1;
vhostfdname = tap->has_vhostfd ? tap->vhostfd : NULL;
+ script = tap->has_script ? tap->script : NULL;
+ downscript = tap->has_downscript ? tap->downscript : NULL;
/* QEMU hubs do not support multiqueue tap, in this case peer is set.
* For -netdev, peer is always NULL. */
@@ -934,13 +940,19 @@ free_fail:
return -1;
}
} else {
+ g_autofree char *default_script = NULL;
+ g_autofree char *default_downscript = NULL;
if (tap->has_vhostfds) {
error_setg(errp, "vhostfds= is invalid if fds= wasn't specified");
return -1;
}
- script = tap->has_script ? tap->script : DEFAULT_NETWORK_SCRIPT;
- downscript = tap->has_downscript ? tap->downscript :
- DEFAULT_NETWORK_DOWN_SCRIPT;
+
+ if (!script) {
+ script = default_script = get_relocated_path(DEFAULT_NETWORK_SCRIPT);
+ }
+ if (!downscript) {
+ downscript = default_downscript = get_relocated_path(DEFAULT_NETWORK_SCRIPT);
+ }
if (tap->has_ifname) {
pstrcpy(ifname, sizeof ifname, tap->ifname);