From patchwork Mon Sep 17 10:00:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Voevodin X-Patchwork-Id: 184373 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 C166E2C008A for ; Mon, 17 Sep 2012 20:41:48 +1000 (EST) Received: from localhost ([::1]:34992 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDY97-0007Rd-BV for incoming@patchwork.ozlabs.org; Mon, 17 Sep 2012 06:01:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDY8V-0006Gz-P1 for qemu-devel@nongnu.org; Mon, 17 Sep 2012 06:01:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDY8P-000534-RV for qemu-devel@nongnu.org; Mon, 17 Sep 2012 06:01:03 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:35110) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDY8P-00052u-Ln for qemu-devel@nongnu.org; Mon, 17 Sep 2012 06:00:57 -0400 Received: from eusync3.samsung.com (mailout3.w1.samsung.com [210.118.77.13]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MAH00F58NUENN70@mailout3.w1.samsung.com> for qemu-devel@nongnu.org; Mon, 17 Sep 2012 11:01:26 +0100 (BST) Received: from evvoevodinPC.rnd.samsung.ru ([106.109.8.14]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MAH00DV7NT8FQ90@eusync3.samsung.com> for qemu-devel@nongnu.org; Mon, 17 Sep 2012 11:00:55 +0100 (BST) From: Evgeny Voevodin To: qemu-devel@nongnu.org Date: Mon, 17 Sep 2012 14:00:39 +0400 Message-id: <1347876042-22609-10-git-send-email-e.voevodin@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1347876042-22609-1-git-send-email-e.voevodin@samsung.com> References: <1347876042-22609-1-git-send-email-e.voevodin@samsung.com> X-TM-AS-MML: No X-detected-operating-system: by eggs.gnu.org: Solaris 10 (1203?) X-Received-From: 210.118.77.13 Cc: peter.maydell@linaro.org, kyungmin.park@samsung.com, aliguori@us.ibm.com, Evgeny Voevodin Subject: [Qemu-devel] [RFC v2 09/12] 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 | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/virtio-net.h | 16 +++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index b1998b2..b7cfb1c 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -13,6 +13,8 @@ #include "iov.h" #include "virtio.h" +#include "virtio-transport.h" +#include "virtio-pci.h" #include "net.h" #include "net/checksum.h" #include "net/tap.h" @@ -1080,3 +1082,60 @@ void virtio_net_exit(VirtIODevice *vdev) qemu_del_net_client(&n->nic->nc); virtio_cleanup(&n->vdev); } + +/******************** VirtIONet Device **********************/ + +static int virtio_netdev_init(DeviceState *dev) +{ + VirtIODevice *vdev; + VirtIONetState *s = VIRTIO_NET_FROM_QDEV(dev); + + assert(s->trl != NULL); + + vdev = virtio_net_init(dev, &s->nic, &s->net); + + /* Pass default host_features to transport */ + s->trl->host_features = s->host_features; + + if (virtio_call_backend_init_cb(dev, s->trl, vdev) != 0) { + return -1; + } + + /* Binding should be ready here, let's get final features */ + if (vdev->binding->get_features) { + s->host_features = vdev->binding->get_features(vdev->binding_opaque); + } + return 0; +} + +static Property virtio_net_properties[] = { + DEFINE_VIRTIO_NET_FEATURES(VirtIONetState, host_features), + 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_TRANSPORT("transport", VirtIONetState, trl), + 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; +} + +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..8dd49d3 100644 --- a/hw/virtio-net.h +++ b/hw/virtio-net.h @@ -14,7 +14,9 @@ #ifndef _QEMU_VIRTIO_NET_H #define _QEMU_VIRTIO_NET_H +#include "sysbus.h" #include "virtio.h" +#include "virtio-transport.h" #include "net.h" #include "pci.h" @@ -187,4 +189,18 @@ 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; + + uint32_t host_features; + + VirtIOTransportLink *trl; +} VirtIONetState; + +#define VIRTIO_NET_FROM_QDEV(dev) DO_UPCAST(VirtIONetState, qdev, dev) + #endif