From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEYKu-0003Ty-9y for qemu-devel@nongnu.org; Mon, 13 Jul 2015 03:39:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZEYKt-00042g-7a for qemu-devel@nongnu.org; Mon, 13 Jul 2015 03:39:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEYKt-00041V-1x for qemu-devel@nongnu.org; Mon, 13 Jul 2015 03:39:35 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id A912FB6E6A for ; Mon, 13 Jul 2015 07:39:34 +0000 (UTC) From: Thomas Huth Date: Mon, 13 Jul 2015 09:39:24 +0200 Message-Id: <1436773166-12113-4-git-send-email-thuth@redhat.com> In-Reply-To: <1436773166-12113-1-git-send-email-thuth@redhat.com> References: <1436773166-12113-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH v2 3/5] net/dump: Rework net-dump init functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Stefan Hajnoczi , Jason Wang Cc: Markus Armbruster Move the creation of the dump client from net_dump_init() into net_init_dump(), so we can later use the former function for netdev devices, too. Also rename net_dump_init() to net_dump_state_init() to make it easier distinguishable from net_init_dump(). Signed-off-by: Thomas Huth --- net/dump.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/net/dump.c b/net/dump.c index a430b96..fa63f0b 100644 --- a/net/dump.c +++ b/net/dump.c @@ -111,12 +111,10 @@ static NetClientInfo net_dump_info = { .cleanup = net_dump_cleanup, }; -static int net_dump_init(NetClientState *peer, const char *device, - const char *name, const char *filename, int len, - Error **errp) +static int net_dump_state_init(NetClientState *nc, const char *filename, + int len, Error **errp) { struct pcap_file_hdr hdr; - NetClientState *nc; NetDumpState *s; struct tm tm; int fd; @@ -141,11 +139,6 @@ static int net_dump_init(NetClientState *peer, const char *device, return -1; } - nc = qemu_new_net_client(&net_dump_info, peer, device, name); - - snprintf(nc->info_str, sizeof(nc->info_str), - "dump to %s (len=%d)", filename, len); - s = &nc->nds; s->fd = fd; @@ -160,10 +153,11 @@ static int net_dump_init(NetClientState *peer, const char *device, int net_init_dump(const NetClientOptions *opts, const char *name, NetClientState *peer, Error **errp) { - int len; + int len, rc; const char *file; char def_file[128]; const NetdevDumpOptions *dump; + NetClientState *nc; assert(opts->kind == NET_CLIENT_OPTIONS_KIND_DUMP); dump = opts->dump; @@ -193,5 +187,13 @@ int net_init_dump(const NetClientOptions *opts, const char *name, len = 65536; } - return net_dump_init(peer, "dump", name, file, len, errp); + nc = qemu_new_net_client(&net_dump_info, peer, "dump", name); + snprintf(nc->info_str, sizeof(nc->info_str), + "dump to %s (len=%d)", file, len); + + rc = net_dump_state_init(nc, file, len, errp); + if (rc) { + qemu_del_net_client(nc); + } + return rc; } -- 1.8.3.1