From patchwork Thu Sep 10 15:18:59 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 33334 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 7112DB70B0 for ; Fri, 11 Sep 2009 01:50:33 +1000 (EST) Received: from localhost ([127.0.0.1]:58781 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mlluo-0000cc-Kf for incoming@patchwork.ozlabs.org; Thu, 10 Sep 2009 11:50:30 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MllY6-0006Kc-5c for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:27:02 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MllXu-0006Di-49 for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:26:54 -0400 Received: from [199.232.76.173] (port=40183 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MllXt-0006Cz-2U for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:26:49 -0400 Received: from mail16.svc.cra.dublin.eircom.net ([159.134.118.215]:41530) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1MllXq-00007l-KX for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:26:46 -0400 Received: (qmail 69417 messnum 3301321 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 mail16.svc.cra.dublin.eircom.net (qp 69417) with SMTP; 10 Sep 2009 15:20:06 -0000 Received: by blaa.localdomain (Postfix, from userid 500) id E549441ABC; Thu, 10 Sep 2009 16:19:01 +0100 (IST) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2009 16:18:59 +0100 Message-Id: <1252595941-15196-18-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 17/19] Port usb net 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 We need net_client_init_from_opts() exported for this Signed-off-by: Mark McLoughlin --- net.c | 2 +- net.h | 2 ++ vl.c | 17 +++++++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/net.c b/net.c index 7812018..bd6c305 100644 --- a/net.c +++ b/net.c @@ -2976,7 +2976,7 @@ static struct { { /* end of list */ } }; -static int net_client_init_from_opts(Monitor *mon, QemuOpts *opts) +int net_client_init_from_opts(Monitor *mon, QemuOpts *opts) { const char *type; int i; diff --git a/net.h b/net.h index f46e6c6..5833958 100644 --- a/net.h +++ b/net.h @@ -4,6 +4,7 @@ #include "sys-queue.h" #include "qemu-common.h" #include "qdict.h" +#include "qemu-option.h" /* VLANs support */ @@ -135,6 +136,7 @@ extern const char *legacy_tftp_prefix; extern const char *legacy_bootp_filename; int net_client_init(Monitor *mon, const char *device, const char *p); +int net_client_init_from_opts(Monitor *mon, QemuOpts *opts); void net_client_uninit(NICInfo *nd); int net_client_parse(const char *str); void net_slirp_smb(const char *exported_dir); diff --git a/vl.c b/vl.c index ed07d50..18f115a 100644 --- a/vl.c +++ b/vl.c @@ -2506,12 +2506,21 @@ static int usb_device_add(const char *devname, int is_hotplug) dev = usb_baum_init(); #endif } else if (strstart(devname, "net:", &p)) { - int nic = nb_nics; + QemuOpts *opts; + int idx; - if (net_client_init(NULL, "nic", p) < 0) + opts = qemu_opts_parse(&qemu_net_opts, p, NULL); + if (!opts) return -1; - nd_table[nic].model = "usb"; - dev = usb_net_init(&nd_table[nic]); + + qemu_opt_set(opts, "type", "nic"); + + idx = net_client_init_from_opts(NULL, opts); + if (idx == -1) + return -1; + + nd_table[idx].model = "usb"; + dev = usb_net_init(&nd_table[idx]); } else if (!strcmp(devname, "bt") || strstart(devname, "bt:", &p)) { dev = usb_bt_init(devname[2] ? hci_init(p) : bt_new_hci(qemu_find_bt_vlan(0)));