From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zlx06-0001ic-Ub for qemu-devel@nongnu.org; Tue, 13 Oct 2015 06:40:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zlx06-0006D4-6M for qemu-devel@nongnu.org; Tue, 13 Oct 2015 06:40:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44406) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zlx06-0006Cu-0v for qemu-devel@nongnu.org; Tue, 13 Oct 2015 06:40:10 -0400 From: Thomas Huth Date: Tue, 13 Oct 2015 12:39:59 +0200 Message-Id: <1444732802-14732-3-git-send-email-thuth@redhat.com> In-Reply-To: <1444732802-14732-1-git-send-email-thuth@redhat.com> References: <1444732802-14732-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH v2 2/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, jasowang@redhat.com Cc: yanghy@cn.fujitsu.com, armbru@redhat.com, stefanha@redhat.com, mst@redhat.com Move the creation of the dump client from net_dump_init() into net_init_dump(), so we can later use the former function for dump via netfilter, 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 | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/net/dump.c b/net/dump.c index aa0d45d..e6f6be0 100644 --- a/net/dump.c +++ b/net/dump.c @@ -118,13 +118,10 @@ static NetClientInfo net_dump_info = { .cleanup = 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(DumpState *s, const char *filename, + int len, Error **errp) { struct pcap_file_hdr hdr; - NetClientState *nc; - DumpState *s; struct tm tm; int fd; @@ -148,13 +145,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 = DO_UPCAST(DumpState, nc, nc); - s->fd = fd; s->pcap_caplen = len; @@ -167,10 +157,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; @@ -200,5 +191,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(DO_UPCAST(DumpState, nc, nc), file, len, errp); + if (rc) { + qemu_del_net_client(nc); + } + return rc; } -- 1.8.3.1