[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 47/57] net: relocate paths to helpers and scripts
From: |
Paolo Bonzini |
Subject: |
[PULL 47/57] net: relocate paths to helpers and scripts |
Date: |
Sat, 19 Sep 2020 11:59:06 -0400 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/net/net.h | 4 ++--
net/tap.c | 26 +++++++++++++++++++-------
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/include/net/net.h b/include/net/net.h
index e7ef42d62b..897b2d7595 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -209,8 +209,8 @@ void netdev_add(QemuOpts *opts, Error **errp);
int net_hub_id_for_client(NetClientState *nc, int *id);
NetClientState *net_hub_port_find(int hub_id);
-#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
-#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
+#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_BRIDGE_INTERFACE "br0"
diff --git a/net/tap.c b/net/tap.c
index 14dc904fca..04ce72dd2f 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);
--
2.26.2
- [PULL 19/57] hw/char/serial: Remove TYPE_SERIAL_IO, (continued)
- [PULL 19/57] hw/char/serial: Remove TYPE_SERIAL_IO, Paolo Bonzini, 2020/09/19
- [PULL 14/57] acpi: i386: Move VMBus DSDT entry to SB, Paolo Bonzini, 2020/09/19
- [PULL 13/57] Simplify the .gitignore file, Paolo Bonzini, 2020/09/19
- [PULL 15/57] numa: drop support for '-numa node' (without memory specified), Paolo Bonzini, 2020/09/19
- [PULL 26/57] hw/char/serial-{isa, pci}: Alias QDEV properties from generic serial object, Paolo Bonzini, 2020/09/19
- [PULL 29/57] hw: megasas: consider 'iov_count=0' is an error in megasas_map_sgl, Paolo Bonzini, 2020/09/19
- [PULL 31/57] meson: move libudev test, Paolo Bonzini, 2020/09/19
- [PULL 45/57] oslib-posix: relocate path to /var, Paolo Bonzini, 2020/09/19
- [PULL 21/57] hw/char/serial: Assert serial_ioport_read/write offset fits 8 bytes, Paolo Bonzini, 2020/09/19
- [PULL 32/57] meson: move libmpathpersist test, Paolo Bonzini, 2020/09/19
- [PULL 47/57] net: relocate paths to helpers and scripts,
Paolo Bonzini <=
- [PULL 35/57] configure: fix --meson=/path/to/meson, Paolo Bonzini, 2020/09/19
- [PULL 52/57] ui: relocate paths to icons and translations, Paolo Bonzini, 2020/09/19
- [PULL 18/57] hw/mips/mipssim: Use MMIO serial device on fake ISA I/O, Paolo Bonzini, 2020/09/19
- [PULL 40/57] meson: report accelerator support, Paolo Bonzini, 2020/09/19
- [PULL 53/57] configure: use a platform-neutral prefix, Paolo Bonzini, 2020/09/19
- [PULL 20/57] configure: rename QEMU_GA_MSI_ENABLED to CONFIG_QGA_MSI, Paolo Bonzini, 2020/09/19
- [PULL 22/57] hw/char/serial: Replace commented DPRINTF() by trace event, Paolo Bonzini, 2020/09/19
- [PULL 25/57] hw/char/serial: Make 'wakeup' property boolean, Paolo Bonzini, 2020/09/19
- [PULL 41/57] oslib: do not call g_strdup from qemu_get_exec_dir, Paolo Bonzini, 2020/09/19
- [PULL 56/57] checkpatch: avoid error on cover letter files, Paolo Bonzini, 2020/09/19