From patchwork Thu Sep 10 15:18:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 33335 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 BB387B7099 for ; Fri, 11 Sep 2009 01:52:20 +1000 (EST) Received: from localhost ([127.0.0.1]:59909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MllwX-0001d3-2g for incoming@patchwork.ozlabs.org; Thu, 10 Sep 2009 11:52:17 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MllY6-0006KO-8o 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-0006DX-4c for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:26:54 -0400 Received: from [199.232.76.173] (port=40181 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MllXt-0006Cv-2I 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]:33007) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1MllXq-00007h-KU for qemu-devel@nongnu.org; Thu, 10 Sep 2009 11:26:46 -0400 Received: (qmail 48748 messnum 12723007 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 48748) with SMTP; 10 Sep 2009 15:20:06 -0000 Received: by blaa.localdomain (Postfix, from userid 500) id CD3B141AC4; Thu, 10 Sep 2009 16:19:01 +0100 (IST) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2009 16:18:56 +0100 Message-Id: <1252595941-15196-15-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 14/19] Port -net dump 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 Note, not incrementing nb_host_devs in net_init_dump() is intentional. Signed-off-by: Mark McLoughlin --- net.c | 54 ++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 42 insertions(+), 12 deletions(-) diff --git a/net.c b/net.c index 3297cb1..54483b4 100644 --- a/net.c +++ b/net.c @@ -2721,6 +2721,29 @@ static int net_init_vde(QemuOpts *opts, Monitor *mon) } #endif +static int net_init_dump(QemuOpts *opts, Monitor *mon) +{ + 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); + file = def_file; + } + + len = qemu_opt_get_size(opts, "len", 65536); + + return net_dump_init(mon, vlan, "dump", name, file, len); +} + #define NET_COMMON_PARAMS_DESC \ { \ .name = "type", \ @@ -2933,6 +2956,22 @@ static struct { { /* end of list */ } }, #endif + }, { + .type = "dump", + .init = net_init_dump, + .desc = { + NET_COMMON_PARAMS_DESC, + { + .name = "len", + .type = QEMU_OPT_SIZE, + .help = "per-packet size limit (64k default)", + }, { + .name = "file", + .type = QEMU_OPT_STRING, + .help = "dump file path (default is qemu-vlan0.pcap)", + }, + { /* end of list */ } + }, }, { /* end of list */ } }; @@ -2976,7 +3015,8 @@ int net_client_init(Monitor *mon, const char *device, const char *p) !strcmp(device, "user") || !strcmp(device, "tap") || !strcmp(device, "socket") || - !strcmp(device, "vde")) { + !strcmp(device, "vde") || + !strcmp(device, "dump")) { QemuOpts *opts; opts = qemu_opts_parse(&qemu_net_opts, p, NULL); @@ -3014,17 +3054,7 @@ int net_client_init(Monitor *mon, const char *device, const char *p) ret = 0; } else #endif - if (!strcmp(device, "dump")) { - int len = 65536; - - if (get_param_value(buf, sizeof(buf), "len", p) > 0) { - len = strtol(buf, NULL, 0); - } - if (!get_param_value(buf, sizeof(buf), "file", p)) { - snprintf(buf, sizeof(buf), "qemu-vlan%d.pcap", vlan_id); - } - ret = net_dump_init(mon, vlan, device, name, buf, len); - } else { + { config_error(mon, "Unknown network device: %s\n", device); ret = -1; goto out;