From patchwork Tue Jan 15 14:09:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 212176 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 2E5492C007A for ; Wed, 16 Jan 2013 01:28:46 +1100 (EST) Received: from localhost ([::1]:55570 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7Fy-00050a-HI for incoming@patchwork.ozlabs.org; Tue, 15 Jan 2013 09:12:50 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7EL-0001Bo-KZ for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:12:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv7E3-00011u-A4 for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:11:09 -0500 Received: from greensocs.com ([87.106.252.221]:60396 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7E2-000116-Mi for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:10:50 -0500 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id 00DE943EE2B; Tue, 15 Jan 2013 14:10:50 +0000 (UTC) Received: from s15328186.onlinehome-server.info ([127.0.0.1]) by localhost (s15328186.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Son78hKbr8cr; Tue, 15 Jan 2013 15:10:49 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 91C6A43EE35; Tue, 15 Jan 2013 15:10:20 +0100 (CET) Received: from compaq.katmai.xl.cx.katmai.xl.cx (lan31-11-83-155-143-136.fbx.proxad.net [83.155.143.136]) by s15328186.onlinehome-server.info (Postfix) with ESMTPSA id C3C0E43EE33; Tue, 15 Jan 2013 15:10:18 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Tue, 15 Jan 2013 15:09:22 +0100 Message-Id: <1358258998-6504-9-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1358258998-6504-1-git-send-email-fred.konrad@greensocs.com> References: <1358258998-6504-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 87.106.252.221 Cc: kwolf@redhat.com, peter.maydell@linaro.org, e.voevodin@samsung.com, mst@redhat.com, mark.burton@greensocs.com, agraf@suse.de, amit.shah@redhat.com, aneesh.kumar@linux.vnet.ibm.com, stefanha@redhat.com, deepakcs@linux.vnet.ibm.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH V3 08/44] virtio-net: add the 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 From: KONRAD Frederic Create virtio-net which extends virtio-device, so it can be connected on virtio-bus. Signed-off-by: KONRAD Frederic --- hw/virtio-net.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- hw/virtio-net.h | 18 +++++++++ hw/virtio-pci.c | 7 +--- hw/virtio-pci.h | 4 +- 4 files changed, 133 insertions(+), 13 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index a012318..5241a76 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -20,6 +20,7 @@ #include "qemu/timer.h" #include "virtio-net.h" #include "vhost_net.h" +#include "virtio-bus.h" #define VIRTIO_NET_VM_VERSION 11 @@ -30,6 +31,9 @@ * - we could suppress RX interrupt if we were so inclined. */ +/* + * Moving to QOM later in this serie. + */ static VirtIONet *to_virtio_net(VirtIODevice *vdev) { return (VirtIONet *)vdev; @@ -985,14 +989,33 @@ static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx, vdev, idx, mask); } -VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf, - virtio_net_conf *net) +void virtio_net_set_conf(DeviceState *dev, virtio_net_conf *net_conf, + NICConf *nic_conf) { - VirtIONet *n; + VirtIONet *n = VIRTIO_NET(dev); + memcpy(&(n->net_conf), net_conf, sizeof(struct virtio_net_conf)); + memcpy(&(n->nic_conf), nic_conf, sizeof(struct NICConf)); +} - n = (VirtIONet *)virtio_common_init("virtio-net", VIRTIO_ID_NET, - sizeof(struct virtio_net_config), - sizeof(VirtIONet)); +static VirtIODevice *virtio_net_common_init(DeviceState *dev, NICConf *conf, + virtio_net_conf *net, VirtIONet **pn) +{ + VirtIONet *n = *pn; + + /* + * We have two cases here: the old virtio-net-pci device, and the + * refactored virtio-net. + */ + if (n == NULL) { + /* virtio-net-pci */ + n = (VirtIONet *)virtio_common_init("virtio-net", VIRTIO_ID_NET, + sizeof(struct virtio_net_config), + sizeof(VirtIONet)); + } else { + /* virtio-net */ + virtio_init(VIRTIO_DEVICE(n), "virtio-net", VIRTIO_ID_NET, + sizeof(struct virtio_net_config)); + } n->vdev.get_config = virtio_net_get_config; n->vdev.set_config = virtio_net_set_config; @@ -1054,6 +1077,13 @@ VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf, return &n->vdev; } +VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf, + virtio_net_conf *net) +{ + VirtIONet *n = NULL; + return virtio_net_common_init(dev, conf, net, &n); +} + void virtio_net_exit(VirtIODevice *vdev) { VirtIONet *n = DO_UPCAST(VirtIONet, vdev, vdev); @@ -1078,3 +1108,78 @@ void virtio_net_exit(VirtIODevice *vdev) qemu_del_net_client(&n->nic->nc); virtio_cleanup(&n->vdev); } + +static int virtio_net_device_init(VirtIODevice *vdev) +{ + DeviceState *qdev = DEVICE(vdev); + VirtIONet *n = VIRTIO_NET(vdev); + if (virtio_net_common_init(qdev, &(n->nic_conf), + &(n->net_conf), &n) == NULL) { + return -1; + } + return 0; +} + +static int virtio_net_device_exit(DeviceState *qdev) +{ + VirtIONet *n = VIRTIO_NET(qdev); + VirtIODevice *vdev = VIRTIO_DEVICE(qdev); + + /* This will stop vhost backend if appropriate. */ + virtio_net_set_status(vdev, 0); + + qemu_purge_queued_packets(&n->nic->nc); + + unregister_savevm(qdev, "virtio-net", n); + + g_free(n->mac_table.macs); + g_free(n->vlans); + + if (n->tx_timer) { + qemu_del_timer(n->tx_timer); + qemu_free_timer(n->tx_timer); + } else { + qemu_bh_delete(n->tx_bh); + } + + qemu_del_net_client(&n->nic->nc); + virtio_common_cleanup(vdev); + return 0; +} + +static Property virtio_net_properties[] = { + DEFINE_VIRTIO_NET_PROPERTIES(VirtIONet), + DEFINE_PROP_END_OF_LIST(), +}; + +static void virtio_net_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); + dc->exit = virtio_net_device_exit; + dc->props = virtio_net_properties; + vdc->init = virtio_net_device_init; + vdc->get_config = virtio_net_get_config; + vdc->set_config = virtio_net_set_config; + vdc->get_features = virtio_net_get_features; + vdc->set_features = virtio_net_set_features; + vdc->bad_features = virtio_net_bad_features; + vdc->reset = virtio_net_reset; + vdc->set_status = virtio_net_set_status; + vdc->guest_notifier_mask = virtio_net_guest_notifier_mask; + vdc->guest_notifier_pending = virtio_net_guest_notifier_pending; +} + +static const TypeInfo virtio_net_info = { + .name = TYPE_VIRTIO_NET, + .parent = TYPE_VIRTIO_DEVICE, + .instance_size = sizeof(VirtIONet), + .class_init = virtio_net_class_init, +}; + +static void virtio_register_types(void) +{ + type_register_static(&virtio_net_info); +} + +type_init(virtio_register_types) diff --git a/hw/virtio-net.h b/hw/virtio-net.h index f6ff85d..2bdc8fd 100644 --- a/hw/virtio-net.h +++ b/hw/virtio-net.h @@ -17,6 +17,10 @@ #include "virtio.h" #include "pci/pci.h" +#define TYPE_VIRTIO_NET "virtio-net" +#define VIRTIO_NET(obj) \ + OBJECT_CHECK(VirtIONet, (obj), TYPE_VIRTIO_NET) + #define ETH_ALEN 6 /* from Linux's virtio_net.h */ @@ -162,6 +166,8 @@ typedef struct VirtIONet { uint8_t *macs; } mac_table; uint32_t *vlans; + virtio_net_conf net_conf; + NICConf nic_conf; DeviceState *qdev; } VirtIONet; @@ -200,4 +206,16 @@ typedef struct VirtIONet { 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) + +#define DEFINE_VIRTIO_NET_PROPERTIES(_state) \ + DEFINE_NIC_PROPERTIES(_state, nic_conf), \ + DEFINE_PROP_UINT32("x-txtimer", _state, net_conf.txtimer, \ + TX_TIMER_INTERVAL), \ + DEFINE_PROP_INT32("x-txburst", _state, net_conf.txburst, \ + TX_BURST), \ + DEFINE_PROP_STRING("tx", _state, net_conf.tx) + +void virtio_net_set_conf(DeviceState *dev, virtio_net_conf *net_conf, + NICConf *nic_conf); + #endif diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 1c7446f..f206380 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -968,7 +968,7 @@ static int virtio_net_init_pci(PCIDevice *pci_dev) VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); VirtIODevice *vdev; - vdev = virtio_net_init(&pci_dev->qdev, &proxy->nic, &proxy->net); + vdev = virtio_net_init(&pci_dev->qdev, &proxy->nic_conf, &proxy->net_conf); vdev->nvectors = proxy->nvectors; virtio_init_pci(proxy, vdev); @@ -1053,10 +1053,7 @@ static Property virtio_net_properties[] = { DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, false), DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 3), DEFINE_VIRTIO_NET_FEATURES(VirtIOPCIProxy, host_features), - DEFINE_NIC_PROPERTIES(VirtIOPCIProxy, nic), - DEFINE_PROP_UINT32("x-txtimer", VirtIOPCIProxy, net.txtimer, TX_TIMER_INTERVAL), - DEFINE_PROP_INT32("x-txburst", VirtIOPCIProxy, net.txburst, TX_BURST), - DEFINE_PROP_STRING("tx", VirtIOPCIProxy, net.tx), + DEFINE_VIRTIO_NET_PROPERTIES(VirtIOPCIProxy), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h index 0bf2cd0..36a04fc 100644 --- a/hw/virtio-pci.h +++ b/hw/virtio-pci.h @@ -73,13 +73,13 @@ struct VirtIOPCIProxy { uint32_t flags; uint32_t class_code; uint32_t nvectors; - NICConf nic; + NICConf nic_conf; uint32_t host_features; #ifdef CONFIG_LINUX V9fsConf fsconf; #endif virtio_serial_conf serial; - virtio_net_conf net; + virtio_net_conf net_conf; VirtIOSCSIConf scsi; VirtIORNGConf rng; bool ioeventfd_disabled;