From patchwork Thu Oct 8 18:58:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 35514 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 DCA68B7B65 for ; Fri, 9 Oct 2009 06:24:10 +1100 (EST) Received: from localhost ([127.0.0.1]:45743 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mvyas-0004YM-V4 for incoming@patchwork.ozlabs.org; Thu, 08 Oct 2009 15:24:07 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvyES-0006OV-UZ for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:00:57 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvyEL-0006JV-Ma for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:00:54 -0400 Received: from [199.232.76.173] (port=52367 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvyEK-0006IC-P8 for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:00:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41851) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MvyEF-000742-HT for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:00:44 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n98J0Dp1020475 for ; Thu, 8 Oct 2009 15:00:39 -0400 Received: from blaa.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n98J0CSu013075; Thu, 8 Oct 2009 15:00:12 -0400 Received: by blaa.localdomain (Postfix, from userid 500) id 342CB425E1; Thu, 8 Oct 2009 19:58:33 +0100 (IST) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Thu, 8 Oct 2009 19:58:21 +0100 Message-Id: <1255028312-28180-6-git-send-email-markmc@redhat.com> In-Reply-To: <1255028312-28180-1-git-send-email-markmc@redhat.com> References: <1255028312-28180-1-git-send-email-markmc@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Mark McLoughlin Subject: [Qemu-devel] [PATCH 05/16] net: handle id= parameter for -net 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 Use id= in the same was as the current name= parameter; if both are specified, id= is used. Signed-off-by: Mark McLoughlin --- net.c | 48 ++++++++++++++++++++---------------------------- 1 files changed, 20 insertions(+), 28 deletions(-) diff --git a/net.c b/net.c index 898b9af..8895e87 100644 --- a/net.c +++ b/net.c @@ -2394,7 +2394,7 @@ static int net_handle_fd_param(Monitor *mon, const char *param) } } -static int net_init_nic(QemuOpts *opts, Monitor *mon) +static int net_init_nic(QemuOpts *opts, Monitor *mon, const char *name) { int idx; NICInfo *nd; @@ -2411,12 +2411,12 @@ static int net_init_nic(QemuOpts *opts, Monitor *mon) nd->vlan = qemu_find_vlan(qemu_opt_get_number(opts, "vlan", 0), 1); + if (name) { + nd->name = qemu_strdup(name); + } if (qemu_opts_id(opts)) { nd->id = qemu_strdup(qemu_opts_id(opts)); } - if (qemu_opt_get(opts, "name")) { - nd->name = qemu_strdup(qemu_opt_get(opts, "name")); - } if (qemu_opt_get(opts, "model")) { nd->model = qemu_strdup(qemu_opt_get(opts, "model")); } @@ -2474,11 +2474,10 @@ static int net_init_slirp_configs(const char *name, const char *value, void *opa return 0; } -static int net_init_slirp(QemuOpts *opts, Monitor *mon) +static int net_init_slirp(QemuOpts *opts, Monitor *mon, const char *name) { VLANState *vlan; struct slirp_config_str *config; - const char *name; const char *vhost; const char *vhostname; const char *vdhcp_start; @@ -2493,8 +2492,6 @@ static int net_init_slirp(QemuOpts *opts, Monitor *mon) vlan = qemu_find_vlan(qemu_opt_get_number(opts, "vlan", 0), 1); - name = qemu_opt_get(opts, "name"); - vhost = qemu_opt_get(opts, "host"); vhostname = qemu_opt_get(opts, "hostname"); vdhcp_start = qemu_opt_get(opts, "dhcpstart"); @@ -2550,15 +2547,13 @@ static int net_init_slirp(QemuOpts *opts, Monitor *mon) #endif /* CONFIG_SLIRP */ #ifdef _WIN32 -static int net_init_tap_win32(QemuOpts *opts, Monitor *mon) +static int net_init_tap_win32(QemuOpts *opts, Monitor *mon, const char *name) { 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) { @@ -2575,16 +2570,13 @@ static int net_init_tap_win32(QemuOpts *opts, Monitor *mon) return 0; } #elif !defined(_AIX) -static int net_init_tap(QemuOpts *opts, Monitor *mon) +static int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name) { 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; @@ -2637,15 +2629,12 @@ static int net_init_tap(QemuOpts *opts, Monitor *mon) } #endif -static int net_init_socket(QemuOpts *opts, Monitor *mon) +static int net_init_socket(QemuOpts *opts, Monitor *mon, const char *name) { VLANState *vlan; - const char *name; 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; @@ -2721,17 +2710,15 @@ static int net_init_socket(QemuOpts *opts, Monitor *mon) } #ifdef CONFIG_VDE -static int net_init_vde(QemuOpts *opts, Monitor *mon) +static int net_init_vde(QemuOpts *opts, Monitor *mon, const char *name) { VLANState *vlan; - const char *name; const char *sock; const char *group; int port, mode; vlan = qemu_find_vlan(qemu_opt_get_number(opts, "vlan", 0), 1); - name = qemu_opt_get(opts, "name"); sock = qemu_opt_get(opts, "sock"); group = qemu_opt_get(opts, "group"); @@ -2748,18 +2735,15 @@ static int net_init_vde(QemuOpts *opts, Monitor *mon) } #endif -static int net_init_dump(QemuOpts *opts, Monitor *mon) +static int net_init_dump(QemuOpts *opts, Monitor *mon, const char *name) { VLANState *vlan; int len; const char *file; - const char *name; char def_file[128]; vlan = qemu_find_vlan(qemu_opt_get_number(opts, "vlan", 0), 1); - name = qemu_opt_get(opts, "name"); - file = qemu_opt_get(opts, "file"); if (!file) { snprintf(def_file, sizeof(def_file), "qemu-vlan%d.pcap", vlan->id); @@ -2786,7 +2770,9 @@ static int net_init_dump(QemuOpts *opts, Monitor *mon) .help = "identifier for monitor commands", \ } -typedef int (*net_client_init_func)(QemuOpts *opts, Monitor *mon); +typedef int (*net_client_init_func)(QemuOpts *opts, + Monitor *mon, + const char *name); /* magic number, but compiler will warn if too small */ #define NET_MAX_DESC 20 @@ -3005,6 +2991,7 @@ static struct { int net_client_init(Monitor *mon, QemuOpts *opts) { + const char *name; const char *type; int i; @@ -3014,6 +3001,11 @@ int net_client_init(Monitor *mon, QemuOpts *opts) return -1; } + name = qemu_opts_id(opts); + if (!name) { + name = qemu_opt_get(opts, "name"); + } + for (i = 0; net_client_types[i].type != NULL; i++) { if (!strcmp(net_client_types[i].type, type)) { if (qemu_opts_validate(opts, &net_client_types[i].desc[0]) == -1) { @@ -3021,7 +3013,7 @@ int net_client_init(Monitor *mon, QemuOpts *opts) } if (net_client_types[i].init) { - return net_client_types[i].init(opts, mon); + return net_client_types[i].init(opts, mon, name); } else { return 0; }