From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MqP2t-0003nL-MP for qemu-devel@nongnu.org; Wed, 23 Sep 2009 06:25:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MqP2k-0003i4-Gu for qemu-devel@nongnu.org; Wed, 23 Sep 2009 06:25:53 -0400 Received: from [199.232.76.173] (port=37824 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MqP2i-0003ha-Kk for qemu-devel@nongnu.org; Wed, 23 Sep 2009 06:25:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46818) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MqP2h-0001WG-Ow 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 n8NAPl5Q020501 for ; Wed, 23 Sep 2009 06:25:47 -0400 From: Mark McLoughlin Date: Wed, 23 Sep 2009 11:24:21 +0100 Message-Id: <1253701463-3134-23-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> Subject: [Qemu-devel] [PATCH 22/24] Port usb net to QemuOpts List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Mark McLoughlin We need net_client_init_from_opts() exported for this Signed-off-by: Mark McLoughlin --- net.c | 2 +- net.h | 2 ++ vl.c | 19 +++++++++++++++---- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/net.c b/net.c index f66df04..a192761 100644 --- a/net.c +++ b/net.c @@ -2995,7 +2995,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 d48c9b8..1b849b4 100644 --- a/net.h +++ b/net.h @@ -4,6 +4,7 @@ #include "qemu-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 0f2e2f6..f9e60ed 100644 --- a/vl.c +++ b/vl.c @@ -2495,12 +2495,23 @@ 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 = qemu_strdup("usb"); - dev = usb_net_init(&nd_table[nic]); + } + + qemu_opt_set(opts, "type", "nic"); + qemu_opt_set(opts, "model", "usb"); + + idx = net_client_init_from_opts(NULL, opts); + if (idx == -1) { + return -1; + } + + 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))); -- 1.6.2.5