From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mv8WV-0002lP-3G for qemu-devel@nongnu.org; Tue, 06 Oct 2009 07:48:07 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mv8WP-0002f6-Qe for qemu-devel@nongnu.org; Tue, 06 Oct 2009 07:48:06 -0400 Received: from [199.232.76.173] (port=38518 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mv8WP-0002eu-K7 for qemu-devel@nongnu.org; Tue, 06 Oct 2009 07:48:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15408) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mv8WP-0003oA-4I for qemu-devel@nongnu.org; Tue, 06 Oct 2009 07:48:01 -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 n96BIrMM004574 for ; Tue, 6 Oct 2009 07:18:53 -0400 From: Mark McLoughlin Date: Tue, 6 Oct 2009 12:17:11 +0100 Message-Id: <1254827836-11021-22-git-send-email-markmc@redhat.com> In-Reply-To: <1254827783.2720.42.camel@blaa> References: <1254827783.2720.42.camel@blaa> Subject: [Qemu-devel] [PATCH] Port -net dump 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 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 8e216f6..fd4af3c 100644 --- a/net.c +++ b/net.c @@ -2746,6 +2746,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(vlan, "dump", name, file, len); +} + #define NET_COMMON_PARAMS_DESC \ { \ .name = "type", \ @@ -2958,6 +2981,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 */ } }; @@ -3003,7 +3042,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); @@ -3042,17 +3082,7 @@ int net_client_init(Monitor *mon, const char *device, const char *p) } } 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(vlan, device, name, buf, len); - } else { + { qemu_error("Unknown network device: %s\n", device); ret = -1; goto out; -- 1.6.2.5