From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MllY2-0006JN-S2 for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:26:58 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MllXv-0006EN-5L for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:26:55 -0400 Received: from [199.232.76.173] (port=40189 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MllXt-0006DS-Fc for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:26:50 -0400 Received: from mail12.svc.cra.dublin.eircom.net ([159.134.118.28]:42370) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1MllXs-00008L-8r for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:26:48 -0400 From: Mark McLoughlin Date: Thu, 10 Sep 2009 16:18:58 +0100 Message-Id: <1252595941-15196-17-git-send-email-markmc@redhat.com> In-Reply-To: <1252595941-15196-1-git-send-email-markmc@redhat.com> References: <1252595941-15196-1-git-send-email-markmc@redhat.com> Subject: [Qemu-devel] [PATCH 16/19] Port host_net_add monitor command 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 Here is where we rely on qemu_opts_parse() to handle an empty string. We could alternatively explicitly handle this here by using qemu_opts_create() when we're not supplied any parameters, but its cleaner this way. Signed-off-by: Mark McLoughlin --- net.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/net.c b/net.c index 14271ff..7812018 100644 --- a/net.c +++ b/net.c @@ -3064,13 +3064,24 @@ static int net_host_check_device(const char *device) void net_host_device_add(Monitor *mon, const QDict *qdict) { const char *device = qdict_get_str(qdict, "device"); - const char *opts = qdict_get_try_str(qdict, "opts"); + const char *opts_str = qdict_get_try_str(qdict, "opts"); + QemuOpts *opts; if (!net_host_check_device(device)) { monitor_printf(mon, "invalid host network device %s\n", device); return; } - if (net_client_init(mon, device, opts ? opts : "") < 0) { + + opts = qemu_opts_parse(&qemu_net_opts, opts_str ? opts_str : "", NULL); + if (!opts) { + monitor_printf(mon, "parsing network options '%s' failed\n", + opts_str ? opts_str : ""); + return; + } + + qemu_opt_set(opts, "type", device); + + if (net_client_init_from_opts(mon, opts) < 0) { monitor_printf(mon, "adding host network device %s failed\n", device); } } -- 1.6.2.5