From patchwork Mon Mar 26 05:40:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 148646 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 15B4EB6EF4 for ; Mon, 26 Mar 2012 17:35:39 +1100 (EST) Received: from localhost ([::1]:46729 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC2gU-0002VV-L2 for incoming@patchwork.ozlabs.org; Mon, 26 Mar 2012 01:41:38 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC2g1-0001ON-Mw for qemu-devel@nongnu.org; Mon, 26 Mar 2012 01:41:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SC2fz-0001V0-Rq for qemu-devel@nongnu.org; Mon, 26 Mar 2012 01:41:09 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:49664) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC2fz-0001Uj-Ka for qemu-devel@nongnu.org; Mon, 26 Mar 2012 01:41:07 -0400 Received: from /spool/local by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 25 Mar 2012 23:41:05 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sun, 25 Mar 2012 23:41:03 -0600 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id B9CC019D8048 for ; Sun, 25 Mar 2012 23:40:55 -0600 (MDT) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2Q5f2IQ198750 for ; Sun, 25 Mar 2012 23:41:02 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2Q5f2TA015796 for ; Sun, 25 Mar 2012 23:41:02 -0600 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q2Q5ewuA015640; Sun, 25 Mar 2012 23:40:59 -0600 Received: by us.ibm.com (sSMTP sendmail emulation); Mon, 26 Mar 2012 13:40:56 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Mon, 26 Mar 2012 13:40:18 +0800 Message-Id: <1332740423-8426-7-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-3352-0000-0000-00000392093A X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.154 Cc: zwu.kernel@gmail.com, pbonzini@redhat.com, Zhi Yong Wu , stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [RFC 4/9] net: adjust nic 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.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/net.c b/net.c index ff8ddaf..22ed51b 100644 --- a/net.c +++ b/net.c @@ -549,15 +549,17 @@ int net_handle_fd_param(Monitor *mon, const char *param) return fd; } -static int net_init_nic(QemuOpts *opts, - Monitor *mon, - const char *name, - NetClientState *peer) +static int net_init_nic(NETDevice *host_dev) { int idx; NICInfo *nd; const char *netdev; + QemuOpts *opts = host_dev->opts; + //Monitor *mon = host_dev->mon; + char *name = g_strdup(host_dev->name); + NetClientState *peer = host_dev->peer; + idx = nic_get_free_idx(); if (idx == -1 || nb_nics >= MAX_NICS) { error_report("Too Many NICs");