From patchwork Mon Mar 26 05:40:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 148641 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7494EB6EEA for ; Mon, 26 Mar 2012 17:08:46 +1100 (EST) Received: from localhost ([::1]:59922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC36h-000885-1S for incoming@patchwork.ozlabs.org; Mon, 26 Mar 2012 02:08:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC2gc-00030P-8U for qemu-devel@nongnu.org; Mon, 26 Mar 2012 01:41:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SC2ga-0001bG-MD for qemu-devel@nongnu.org; Mon, 26 Mar 2012 01:41:45 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:57763) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC2ga-0001b0-HI for qemu-devel@nongnu.org; Mon, 26 Mar 2012 01:41:44 -0400 Received: from /spool/local by e6.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 26 Mar 2012 01:41:42 -0400 Received: from d01dlp02.pok.ibm.com (9.56.224.85) by e6.ny.us.ibm.com (192.168.1.106) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 26 Mar 2012 01:41:08 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 58F586E8049 for ; Mon, 26 Mar 2012 01:41:07 -0400 (EDT) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2Q5f6oI335998 for ; Mon, 26 Mar 2012 01:41:07 -0400 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2Q5f6ew025017 for ; Sun, 25 Mar 2012 23:41:06 -0600 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q2Q5f2l1024926; Sun, 25 Mar 2012 23:41:03 -0600 Received: by us.ibm.com (sSMTP sendmail emulation); Mon, 26 Mar 2012 13:41:00 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Mon, 26 Mar 2012 13:40:19 +0800 Message-Id: <1332740423-8426-8-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1332740423-8426-1-git-send-email-zwu.kernel@gmail.com> References: <1332740423-8426-1-git-send-email-zwu.kernel@gmail.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12032605-1976-0000-0000-00000BC2B1FF X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.182.146 Cc: zwu.kernel@gmail.com, pbonzini@redhat.com, Zhi Yong Wu , stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [RFC 5/9] net: adjust dump init API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Zhi Yong Wu Signed-off-by: Zhi Yong Wu --- net/dump.c | 8 ++++++-- net/dump.h | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/net/dump.c b/net/dump.c index 0f191d3..16e6efc 100644 --- a/net/dump.c +++ b/net/dump.c @@ -145,13 +145,17 @@ static int net_dump_init(NetClientState *peer, const char *device, return 0; } -int net_init_dump(QemuOpts *opts, Monitor *mon, const char *name, - NetClientState *peer) +int net_init_dump(NETDevice *net_dev) { int len; const char *file; char def_file[128]; + QemuOpts *opts = net_dev->opts; + //Monitor *mon = net_dev->mon; + char *name = g_strdup(net_dev->name); + NetClientState *peer = net_dev->peer; + assert(peer); file = qemu_opt_get(opts, "file"); diff --git a/net/dump.h b/net/dump.h index df22afe..4bccdcf 100644 --- a/net/dump.h +++ b/net/dump.h @@ -27,7 +27,6 @@ #include "net.h" #include "qemu-common.h" -int net_init_dump(QemuOpts *opts, Monitor *mon, - const char *name, NetClientState *peer); +int net_init_dump(NETDevice *net_dev); #endif /* QEMU_NET_DUMP_H */