From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StHAT-0005ro-HV for qemu-devel@nongnu.org; Mon, 23 Jul 2012 07:51:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1StHAP-0000ag-4r for qemu-devel@nongnu.org; Mon, 23 Jul 2012 07:51:17 -0400 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:42985) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StHAO-0000aE-TH for qemu-devel@nongnu.org; Mon, 23 Jul 2012 07:51:13 -0400 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 23 Jul 2012 12:51:12 +0100 Received: from d06av11.portsmouth.uk.ibm.com (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6NBowdr2904220 for ; Mon, 23 Jul 2012 12:50:58 +0100 Received: from d06av11.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6NBowCf015019 for ; Mon, 23 Jul 2012 05:50:58 -0600 From: Stefan Hajnoczi Date: Mon, 23 Jul 2012 12:50:38 +0100 Message-Id: <1343044244-28728-14-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1343044244-28728-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1343044244-28728-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 13/19] convert net_init_dump() to NetClientOptions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Laszlo Ersek , qemu-devel@nongnu.org, Stefan Hajnoczi From: Laszlo Ersek v1->v2: - NetdevDumpOptions::len is of type 'size', whose C type was changed to uint64_t. Adapt the printf() format specifier macro. Signed-off-by: Laszlo Ersek Signed-off-by: Stefan Hajnoczi --- net/dump.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/net/dump.c b/net/dump.c index 27e9528..f3d2fa9 100644 --- a/net/dump.c +++ b/net/dump.c @@ -144,22 +144,35 @@ static int net_dump_init(VLANState *vlan, const char *device, return 0; } -int net_init_dump(QemuOpts *opts, const NetClientOptions *new_opts, +int net_init_dump(QemuOpts *old_opts, const NetClientOptions *opts, const char *name, VLANState *vlan) { int len; const char *file; char def_file[128]; + const NetdevDumpOptions *dump; + + assert(opts->kind == NET_CLIENT_OPTIONS_KIND_DUMP); + dump = opts->dump; assert(vlan); - file = qemu_opt_get(opts, "file"); - if (!file) { + if (dump->has_file) { + file = dump->file; + } else { snprintf(def_file, sizeof(def_file), "qemu-vlan%d.pcap", vlan->id); file = def_file; } - len = qemu_opt_get_size(opts, "len", 65536); + if (dump->has_len) { + if (dump->len > INT_MAX) { + error_report("invalid length: %"PRIu64, dump->len); + return -1; + } + len = dump->len; + } else { + len = 65536; + } return net_dump_init(vlan, "dump", name, file, len); } -- 1.7.10.4