From patchwork Thu Sep 10 15:18:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 33336 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 6FB38B7080 for ; Fri, 11 Sep 2009 01:54:27 +1000 (EST) Received: from localhost ([127.0.0.1]:34163 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mllya-0003KM-K4 for incoming@patchwork.ozlabs.org; Thu, 10 Sep 2009 11:54:24 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MllY6-0006Kd-Uz for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:27:03 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MllXu-0006Dv-3c for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:26:55 -0400 Received: from [199.232.76.173] (port=40186 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MllXt-0006D2-Ba for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:26:49 -0400 Received: from mail10.svc.cra.dublin.eircom.net ([159.134.118.26]:33006) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1MllXq-00007i-Lk for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:26:46 -0400 Received: (qmail 48787 messnum 12723136 invoked from network[83.71.108.236/83-71-108-236-dynamic.b-ras1.srl.dublin.eircom.net]); 10 Sep 2009 15:20:06 -0000 Received: from 83-71-108-236-dynamic.b-ras1.srl.dublin.eircom.net (HELO blaa.localdomain) (83.71.108.236) by mail10.svc.cra.dublin.eircom.net (qp 48787) with SMTP; 10 Sep 2009 15:20:06 -0000 Received: by blaa.localdomain (Postfix, from userid 500) id D829C41AC5; Thu, 10 Sep 2009 16:19:01 +0100 (IST) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2009 16:18:57 +0100 Message-Id: <1252595941-15196-16-git-send-email-markmc@redhat.com> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1252595941-15196-1-git-send-email-markmc@redhat.com> References: <1252595941-15196-1-git-send-email-markmc@redhat.com> X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Mark McLoughlin Subject: [Qemu-devel] [PATCH 15/19] Clean up legacy code in net_client_init() 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 Now that we've ported everything over to QemuOpts, we can kill off all the cruft in net_client_init(). Note, the 'channel' type requires special handling as it uses a format that QemuOpts can't parse Signed-off-by: Mark McLoughlin --- net.c | 56 +++++++++++--------------------------------------------- 1 files changed, 11 insertions(+), 45 deletions(-) diff --git a/net.c b/net.c index 54483b4..14271ff 100644 --- a/net.c +++ b/net.c @@ -3005,38 +3005,7 @@ static int net_client_init_from_opts(Monitor *mon, QemuOpts *opts) int net_client_init(Monitor *mon, const char *device, const char *p) { - char buf[1024]; - int vlan_id, ret; - VLANState *vlan; - char *name = NULL; - - if (!strcmp(device, "none") || - !strcmp(device, "nic") || - !strcmp(device, "user") || - !strcmp(device, "tap") || - !strcmp(device, "socket") || - !strcmp(device, "vde") || - !strcmp(device, "dump")) { - QemuOpts *opts; - - opts = qemu_opts_parse(&qemu_net_opts, p, NULL); - if (!opts) - return -1; - - qemu_opt_set(opts, "type", device); - - return net_client_init_from_opts(mon, opts); - } - - vlan_id = 0; - if (get_param_value(buf, sizeof(buf), "vlan", p)) { - vlan_id = strtol(buf, NULL, 0); - } - vlan = qemu_find_vlan(vlan_id, 1); - - if (get_param_value(buf, sizeof(buf), "name", p)) { - name = qemu_strdup(buf); - } + QemuOpts *opts; #ifdef CONFIG_SLIRP if (!strcmp(device, "channel")) { @@ -3051,20 +3020,17 @@ int net_client_init(Monitor *mon, const char *device, const char *p) } else { slirp_guestfwd(TAILQ_FIRST(&slirp_stacks), mon, p, 1); } - ret = 0; - } else -#endif - { - config_error(mon, "Unknown network device: %s\n", device); - ret = -1; - goto out; - } - if (ret < 0) { - config_error(mon, "Could not initialize device '%s'\n", device); + return 0; } -out: - qemu_free(name); - return ret; +#endif + + opts = qemu_opts_parse(&qemu_net_opts, p, NULL); + if (!opts) + return -1; + + qemu_opt_set(opts, "type", device); + + return net_client_init_from_opts(mon, opts); } void net_client_uninit(NICInfo *nd)