From patchwork Mon Mar 26 05:40:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 148644 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 3C391B6EEA for ; Mon, 26 Mar 2012 17:20:56 +1100 (EST) Received: from localhost ([::1]:45908 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC2gS-00024X-C7 for incoming@patchwork.ozlabs.org; Mon, 26 Mar 2012 01:41:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC2gB-0001tp-Mb for qemu-devel@nongnu.org; Mon, 26 Mar 2012 01:41:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SC2g8-0001WR-Dj for qemu-devel@nongnu.org; Mon, 26 Mar 2012 01:41:19 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:59593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC2g8-0001W2-5e for qemu-devel@nongnu.org; Mon, 26 Mar 2012 01:41:16 -0400 Received: from /spool/local by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 25 Mar 2012 23:41:14 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e35.co.us.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sun, 25 Mar 2012 23:40:56 -0600 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 8142619D804C for ; Sun, 25 Mar 2012 23:40:47 -0600 (MDT) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2Q5escv187328 for ; Sun, 25 Mar 2012 23:40:54 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2Q5erxB003611 for ; Sun, 25 Mar 2012 23:40:53 -0600 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q2Q5enIX003076; Sun, 25 Mar 2012 23:40:50 -0600 Received: by us.ibm.com (sSMTP sendmail emulation); Mon, 26 Mar 2012 13:40:47 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Mon, 26 Mar 2012 13:40:16 +0800 Message-Id: <1332740423-8426-5-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-6148-0000-0000-000004893884 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.153 Cc: zwu.kernel@gmail.com, pbonzini@redhat.com, Zhi Yong Wu , stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [RFC 2/9] net: introduce one net host device class 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 | 35 +++++++++++++++++++++++++++++++++++ net.h | 27 +++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/net.c b/net.c index dd67d16..608c090 100644 --- a/net.c +++ b/net.c @@ -1231,3 +1231,38 @@ int net_client_parse(QemuOptsList *opts_list, const char *optarg) default_net = 0; return 0; } + +static int net_dev_init(HOSTDevice *host_dev) +{ + NETDevice *net_dev = NET_DEVICE(host_dev); + NETDeviceClass *dc = NETDEV_GET_CLASS(host_dev); + + if (dc->init) { + return dc->init(net_dev); + } + + return 0; +} + +static void net_class_init(ObjectClass *klass, void *data) +{ + + HOSTDeviceClass *k = HOSTDEV_CLASS(klass); + + k->init = net_dev_init; +} + +static TypeInfo net_type = { + .name = TYPE_NETDEV, + .parent = TYPE_HOSTDEV, + .instance_size = sizeof(NETDevice), + .class_init = net_class_init, +}; + +static void net_register_types(void) +{ + type_register_static(&net_type); +} + +type_init(net_register_types) + diff --git a/net.h b/net.h index 60837ab..912fa2d 100644 --- a/net.h +++ b/net.h @@ -7,6 +7,33 @@ #include "qemu-option.h" #include "net/queue.h" #include "vmstate.h" +#include "qemu/hostdev.h" + +typedef struct NETDevice NETDevice; + +#define TYPE_NETDEV "net-dev" +#define NET_DEVICE(obj) \ + OBJECT_CHECK(NETDevice, (obj), TYPE_NETDEV) +#define NETDEV_CLASS(klass) \ + OBJECT_CLASS_CHECK(NETDeviceClass, (klass), TYPE_NETDEV) +#define NETDEV_GET_CLASS(obj) \ + OBJECT_GET_CLASS(NETDeviceClass, (obj), TYPE_NETDEV) + +typedef struct NETDeviceClass { + HOSTDeviceClass parent_class; + int (*init)(NETDevice *net_dev); +} NETDeviceClass; + +struct NETDevice { + /*< private >*/ + HOSTDevice host_dev; + + /*< public >*/ + QemuOpts *opts; + Monitor *mon; + const char *name; + NetClientState *peer; +}; struct MACAddr { uint8_t a[6];