From patchwork Wed Apr 25 05:54:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Voevodin X-Patchwork-Id: 154810 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 AB73AB6FA3 for ; Wed, 25 Apr 2012 16:48:21 +1000 (EST) Received: from localhost ([::1]:45176 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMvC9-0004lP-OO for incoming@patchwork.ozlabs.org; Wed, 25 Apr 2012 01:55:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:32798) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMvBV-0002qD-13 for qemu-devel@nongnu.org; Wed, 25 Apr 2012 01:54:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMvBS-0006j1-V6 for qemu-devel@nongnu.org; Wed, 25 Apr 2012 01:54:36 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:51862) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMvBS-0006gf-Pt for qemu-devel@nongnu.org; Wed, 25 Apr 2012 01:54:34 -0400 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from euspt2 ([210.118.77.14]) by mailout4.w1.samsung.com (Sun Java(tm) System Messaging Server 6.3-8.04 (built Jul 29 2009; 32bit)) with ESMTP id <0M3000GW7TR51A70@mailout4.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 25 Apr 2012 06:54:41 +0100 (BST) Received: from evvoevodinPC.rnd.samsung.ru ([106.109.9.191]) by spt2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0M300064STQJKX@spt2.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 25 Apr 2012 06:54:30 +0100 (BST) Date: Wed, 25 Apr 2012 09:54:15 +0400 From: Evgeny Voevodin In-reply-to: <1335333257-5128-1-git-send-email-e.voevodin@samsung.com> To: qemu-devel@nongnu.org Message-id: <1335333257-5128-8-git-send-email-e.voevodin@samsung.com> X-Mailer: git-send-email 1.7.5.4 References: <1335333257-5128-1-git-send-email-e.voevodin@samsung.com> X-detected-operating-system: by eggs.gnu.org: Solaris 9.1 X-Received-From: 210.118.77.14 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, i.mitsyanko@samsung.com, Evgeny Voevodin , kyungmin.park@samsung.com, d.solodkiy@samsung.com, m.kozlov@samsung.com Subject: [Qemu-devel] [RFC 7/9] hw/virtio-net.c: Add virtio-net device. 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 Signed-off-by: Evgeny Voevodin --- hw/virtio-net.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ hw/virtio-net.h | 11 +++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index bc5e3a8..febf384 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -13,6 +13,7 @@ #include "iov.h" #include "virtio.h" +#include "virtio-transport.h" #include "net.h" #include "net/checksum.h" #include "net/tap.h" @@ -1076,3 +1077,48 @@ void virtio_net_exit(VirtIODevice *vdev) qemu_del_vlan_client(&n->nic->nc); virtio_cleanup(&n->vdev); } + +/******************** VirtIONet Device **********************/ + +static int virtio_netdev_init(DeviceState *dev) +{ + VirtIODevice *vdev; + VirtIONetState *proxy = VIRTIO_NET_FROM_QDEV(dev); + vdev = virtio_net_init(dev, &proxy->nic, &proxy->net); + if (!vdev) { + return -1; + } + return virtio_init_transport(dev, vdev); +} + +static Property virtio_net_properties[] = { + DEFINE_NIC_PROPERTIES(VirtIONetState, nic), + DEFINE_PROP_UINT32("x-txtimer", VirtIONetState, + net.txtimer, TX_TIMER_INTERVAL), + DEFINE_PROP_INT32("x-txburst", VirtIONetState, + net.txburst, TX_BURST), + DEFINE_PROP_STRING("tx", VirtIONetState, net.tx), + DEFINE_PROP_END_OF_LIST(), +}; + +static void virtio_net_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + dc->init = virtio_netdev_init; + dc->props = virtio_net_properties; + dc->bus_info = &virtio_transport_bus_info; +} + +static TypeInfo virtio_net_info = { + .name = "virtio-net", + .parent = TYPE_DEVICE, + .instance_size = sizeof(VirtIONetState), + .class_init = virtio_net_class_init, +}; + +static void virtio_net_register_types(void) +{ + type_register_static(&virtio_net_info); +} + +type_init(virtio_net_register_types) diff --git a/hw/virtio-net.h b/hw/virtio-net.h index 36aa463..74a55c8 100644 --- a/hw/virtio-net.h +++ b/hw/virtio-net.h @@ -14,6 +14,7 @@ #ifndef _QEMU_VIRTIO_NET_H #define _QEMU_VIRTIO_NET_H +#include "sysbus.h" #include "virtio.h" #include "net.h" #include "pci.h" @@ -187,4 +188,14 @@ struct virtio_net_ctrl_mac { DEFINE_PROP_BIT("ctrl_rx", _state, _field, VIRTIO_NET_F_CTRL_RX, true), \ DEFINE_PROP_BIT("ctrl_vlan", _state, _field, VIRTIO_NET_F_CTRL_VLAN, true), \ DEFINE_PROP_BIT("ctrl_rx_extra", _state, _field, VIRTIO_NET_F_CTRL_RX_EXTRA, true) + +typedef struct { + DeviceState qdev; + /* virtio-net */ + NICConf nic; + virtio_net_conf net; +} VirtIONetState; + +#define VIRTIO_NET_FROM_QDEV(dev) DO_UPCAST(VirtIONetState, qdev, dev) + #endif