From patchwork Wed Sep 23 10:24:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 34141 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 11C53B7B77 for ; Wed, 23 Sep 2009 21:16:27 +1000 (EST) Received: from localhost ([127.0.0.1]:57854 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MqPpf-00023w-Sz for incoming@patchwork.ozlabs.org; Wed, 23 Sep 2009 07:16:23 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MqP2t-0003p5-TE for qemu-devel@nongnu.org; Wed, 23 Sep 2009 06:26:00 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MqP2i-0003hl-VT for qemu-devel@nongnu.org; Wed, 23 Sep 2009 06:25:55 -0400 Received: from [199.232.76.173] (port=37819 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MqP2i-0003hS-HP for qemu-devel@nongnu.org; Wed, 23 Sep 2009 06:25:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29234) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MqP2h-0001W2-Ca for qemu-devel@nongnu.org; Wed, 23 Sep 2009 06:25:48 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8NAPkgG025958 for ; Wed, 23 Sep 2009 06:25:46 -0400 Received: from blaa.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8NAPjug012116; Wed, 23 Sep 2009 06:25:45 -0400 Received: by blaa.localdomain (Postfix, from userid 500) id 41DF047442; Wed, 23 Sep 2009 11:24:24 +0100 (IST) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Wed, 23 Sep 2009 11:24:15 +0100 Message-Id: <1253701463-3134-17-git-send-email-markmc@redhat.com> In-Reply-To: <1253701463-3134-1-git-send-email-markmc@redhat.com> References: <1253701463-3134-1-git-send-email-markmc@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Mark McLoughlin Subject: [Qemu-devel] [PATCH 16/24] Port -net tap to QemuOpts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some parameters are not valid with fd=. Rather than having a separate parameter description table for validating fd=, it's easir to just check for those invalid parameters later. Note, the need to possible lookup a file descriptor name from the monitor is the reason why all these init functions are passed a Monitor pointer. Signed-off-by: Mark McLoughlin --- net.c | 225 ++++++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 138 insertions(+), 87 deletions(-) diff --git a/net.c b/net.c index 5cc72b2..468d25c 100644 --- a/net.c +++ b/net.c @@ -1376,25 +1376,22 @@ static void tap_send(void *opaque) */ #define TAP_DEFAULT_SNDBUF 1024*1024 -static void tap_set_sndbuf(TAPState *s, const char *sndbuf_str, Monitor *mon) +static void tap_set_sndbuf(TAPState *s, QemuOpts *opts, Monitor *mon) { - int sndbuf = TAP_DEFAULT_SNDBUF; - - if (sndbuf_str) { - sndbuf = atoi(sndbuf_str); - } + int sndbuf; + sndbuf = qemu_opt_get_size(opts, "sndbuf", TAP_DEFAULT_SNDBUF); if (!sndbuf) { sndbuf = INT_MAX; } - if (ioctl(s->fd, TUNSETSNDBUF, &sndbuf) == -1 && sndbuf_str) { + if (ioctl(s->fd, TUNSETSNDBUF, &sndbuf) == -1 && qemu_opt_get(opts, "sndbuf")) { config_error(mon, "TUNSETSNDBUF ioctl failed: %s\n", strerror(errno)); } } #else -static void tap_set_sndbuf(TAPState *s, const char *sndbuf_str, Monitor *mon) +static void tap_set_sndbuf(TAPState *s, QemuOpts *opts, Monitor *mon) { if (sndbuf_str) { config_error(mon, "No '-net tap,sndbuf=' support available\n"); @@ -2546,6 +2543,92 @@ static int net_init_slirp(QemuOpts *opts, Monitor *mon) return ret; } +#ifdef _WIN32 +static int net_init_tap_win32(QemuOpts *opts, Monitor *mon) +{ + VLANState *vlan; + const char *name; + const char *ifname; + + vlan = qemu_find_vlan(qemu_opt_get_number(opts, "vlan", 0), 1); + + name = qemu_opt_get(opts, "name"); + ifname = qemu_opt_get(opts, "ifname"); + + if (!ifname) { + qemu_error("tap: no interface name\n"); + return -1; + } + + if (tap_win32_init(vlan, "tap", name, ifname) == -1) { + return -1; + } + + vlan->nb_host_devs++; + + return 0; +} +#elif !defined(_AIX) +static int net_init_tap(QemuOpts *opts, Monitor *mon) +{ + VLANState *vlan; + const char *name; + TAPState *s; + + vlan = qemu_find_vlan(qemu_opt_get_number(opts, "vlan", 0), 1); + + name = qemu_opt_get(opts, "name"); + + if (qemu_opt_get(opts, "fd")) { + int fd; + + if (qemu_opt_get(opts, "ifname") || + qemu_opt_get(opts, "script") || + qemu_opt_get(opts, "downscript")) { + qemu_error("ifname=, script= and downscript= is invalid with fd=\n"); + return -1; + } + + fd = net_handle_fd_param(mon, qemu_opt_get(opts, "fd")); + if (fd == -1) { + return -1; + } + + fcntl(fd, F_SETFL, O_NONBLOCK); + + s = net_tap_fd_init(vlan, "tap", name, fd); + if (!s) { + close(fd); + } + } else { + const char *ifname, *script, *downscript; + + ifname = qemu_opt_get(opts, "ifname"); + script = qemu_opt_get(opts, "script"); + downscript = qemu_opt_get(opts, "downscript"); + + if (!script) { + script = DEFAULT_NETWORK_SCRIPT; + } + if (!downscript) { + downscript = DEFAULT_NETWORK_DOWN_SCRIPT; + } + + s = net_tap_init(vlan, "tap", name, ifname, script, downscript); + } + + if (!s) { + return -1; + } + + tap_set_sndbuf(s, opts, mon); + + vlan->nb_host_devs++; + + return 0; +} +#endif + #define NET_COMMON_PARAMS_DESC \ { \ .name = "type", \ @@ -2663,6 +2746,51 @@ static struct { { /* end of list */ } }, #endif +#ifdef _WIN32 + }, { + .type = "tap", + .init = net_init_tap_win32, + .desc = { + NET_COMMON_PARAMS_DESC, + { + .name = "ifname", + .type = QEMU_OPT_STRING, + .help = "interface name", + }, + { /* end of list */ } + }, +#elif !defined(_AIX) + }, { + .type = "tap", + .init = net_init_tap, + .desc = { + NET_COMMON_PARAMS_DESC, + { + .name = "fd", + .type = QEMU_OPT_STRING, + .help = "file descriptor of an already opened tap", + }, { + .name = "ifname", + .type = QEMU_OPT_STRING, + .help = "interface name", + }, { + .name = "script", + .type = QEMU_OPT_STRING, + .help = "script to initialize the interface", + }, { + .name = "downscript", + .type = QEMU_OPT_STRING, + .help = "script to shut down the interface", +#ifdef TUNSETSNDBUF + }, { + .name = "sndbuf", + .type = QEMU_OPT_SIZE, + .help = "send buffer limit" +#endif + }, + { /* end of list */ } + }, +#endif }, { /* end of list */ } }; @@ -2705,7 +2833,8 @@ int net_client_init(Monitor *mon, const char *device, const char *p) if (!strcmp(device, "none") || !strcmp(device, "nic") || - !strcmp(device, "user")) { + !strcmp(device, "user") || + !strcmp(device, "tap")) { QemuOpts *opts; opts = qemu_opts_parse(&qemu_net_opts, p, NULL); @@ -2744,84 +2873,6 @@ int net_client_init(Monitor *mon, const char *device, const char *p) ret = 0; } else #endif -#ifdef _WIN32 - if (!strcmp(device, "tap")) { - static const char * const tap_params[] = { - "vlan", "name", "ifname", NULL - }; - char ifname[64]; - - if (check_params(buf, sizeof(buf), tap_params, p) < 0) { - config_error(mon, "invalid parameter '%s' in '%s'\n", buf, p); - ret = -1; - goto out; - } - if (get_param_value(ifname, sizeof(ifname), "ifname", p) <= 0) { - config_error(mon, "tap: no interface name\n"); - ret = -1; - goto out; - } - vlan->nb_host_devs++; - ret = tap_win32_init(vlan, device, name, ifname); - } else -#elif defined (_AIX) -#else - if (!strcmp(device, "tap")) { - char ifname[64], chkbuf[64]; - char setup_script[1024], down_script[1024]; - TAPState *s; - int fd; - vlan->nb_host_devs++; - if (get_param_value(buf, sizeof(buf), "fd", p) > 0) { - static const char * const fd_params[] = { - "vlan", "name", "fd", "sndbuf", NULL - }; - ret = -1; - if (check_params(chkbuf, sizeof(chkbuf), fd_params, p) < 0) { - config_error(mon, "invalid parameter '%s' in '%s'\n", chkbuf, p); - goto out; - } - fd = net_handle_fd_param(mon, buf); - if (fd == -1) { - goto out; - } - fcntl(fd, F_SETFL, O_NONBLOCK); - s = net_tap_fd_init(vlan, device, name, fd); - if (!s) { - close(fd); - } - } else { - static const char * const tap_params[] = { - "vlan", "name", "ifname", "script", "downscript", "sndbuf", NULL - }; - if (check_params(chkbuf, sizeof(chkbuf), tap_params, p) < 0) { - config_error(mon, "invalid parameter '%s' in '%s'\n", chkbuf, p); - ret = -1; - goto out; - } - if (get_param_value(ifname, sizeof(ifname), "ifname", p) <= 0) { - ifname[0] = '\0'; - } - if (get_param_value(setup_script, sizeof(setup_script), "script", p) == 0) { - pstrcpy(setup_script, sizeof(setup_script), DEFAULT_NETWORK_SCRIPT); - } - if (get_param_value(down_script, sizeof(down_script), "downscript", p) == 0) { - pstrcpy(down_script, sizeof(down_script), DEFAULT_NETWORK_DOWN_SCRIPT); - } - s = net_tap_init(vlan, device, name, ifname, setup_script, down_script); - } - if (s != NULL) { - const char *sndbuf_str = NULL; - if (get_param_value(buf, sizeof(buf), "sndbuf", p)) { - sndbuf_str = buf; - } - tap_set_sndbuf(s, sndbuf_str, mon); - ret = 0; - } else { - ret = -1; - } - } else -#endif if (!strcmp(device, "socket")) { char chkbuf[64]; if (get_param_value(buf, sizeof(buf), "fd", p) > 0) {