From patchwork Mon Mar 26 05:40:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 148640 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 DE131B6EE7 for ; Mon, 26 Mar 2012 17:07:04 +1100 (EST) Received: from localhost ([::1]:56988 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC354-0006hC-Mp for incoming@patchwork.ozlabs.org; Mon, 26 Mar 2012 02:07:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53518) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC2ge-00031G-EN for qemu-devel@nongnu.org; Mon, 26 Mar 2012 01:41:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SC2gb-0001bS-Mn for qemu-devel@nongnu.org; Mon, 26 Mar 2012 01:41:48 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:57792) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC2gb-0001b4-IT for qemu-devel@nongnu.org; Mon, 26 Mar 2012 01:41:45 -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:44 -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:21 -0400 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 7AC9B6E8049 for ; Mon, 26 Mar 2012 01:41:20 -0400 (EDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2Q5fKxb3559476 for ; Mon, 26 Mar 2012 01:41:20 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2QBCBaP011296 for ; Mon, 26 Mar 2012 07:12:12 -0400 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q2QBC8eb010863; Mon, 26 Mar 2012 07:12:09 -0400 Received: by us.ibm.com (sSMTP sendmail emulation); Mon, 26 Mar 2012 13:41:13 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Mon, 26 Mar 2012 13:40:22 +0800 Message-Id: <1332740423-8426-11-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-00000BC2B220 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 8/9] net: qomify -netdev vde 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/vde.c | 34 ++++++++++++++++++++++++++++++++-- net/vde.h | 4 ++-- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/net/vde.c b/net/vde.c index 8d9e1c6..c06716d 100644 --- a/net/vde.c +++ b/net/vde.c @@ -110,13 +110,17 @@ static int net_vde_init(NetClientState *peer, const char *model, return 0; } -int net_init_vde(QemuOpts *opts, Monitor *mon, const char *name, - NetClientState *peer) +int net_init_vde(HOSTDevice *net_dev) { const char *sock; const char *group; int port, mode; + QemuOpts *opts = net_dev->opts; + Monitor *mon = net_dev->mon; + char *name = g_strdup(net_dev->name); + NetClientState *peer = net_dev->peer; + sock = qemu_opt_get(opts, "sock"); group = qemu_opt_get(opts, "group"); @@ -129,3 +133,29 @@ int net_init_vde(QemuOpts *opts, Monitor *mon, const char *name, return 0; } + +static hostdevProperty net_vde_properties[] = { + DEFINE_HOSTDEV_PROP_END_OF_LIST(), +}; + +static void net_vde_class_init(ObjectClass *klass, void *data) +{ + HOSTDeviceClass *k = HOSTDEV_CLASS(klass); + + k->init = net_init_vde; + k->props = net_vde_properties; +} + +static TypeInfo net_vde_type = { + .name = "vde", + .parent = TYPE_HOSTDEV, + .instance_size = sizeof(NetClientState), + .class_init = net_vde_class_init, +}; + +static void net_vde_register_types(void) +{ + type_register_static(&net_user_type); +} + +type_init(net_vde_register_types) diff --git a/net/vde.h b/net/vde.h index 276e1ff..c99a3a9 100644 --- a/net/vde.h +++ b/net/vde.h @@ -26,11 +26,11 @@ #include "qemu-common.h" #include "qemu-option.h" +#include "qemu/hostdev.h" #ifdef CONFIG_VDE -int net_init_vde(QemuOpts *opts, Monitor *mon, const char *name, - NetClientState *peer); +int net_init_vde(NETDevice *net_dev); #endif /* CONFIG_VDE */