From patchwork Fri Dec 7 13:32:33 2012 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: 204516 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 9D94C2C00D6 for ; Sat, 8 Dec 2012 01:41:29 +1100 (EST) Received: from localhost ([::1]:45626 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tgy3q-0005Ib-CA for incoming@patchwork.ozlabs.org; Fri, 07 Dec 2012 08:33:50 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tgy31-0004Es-NC for qemu-devel@nongnu.org; Fri, 07 Dec 2012 08:33:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tgy2r-0007BE-Ld for qemu-devel@nongnu.org; Fri, 07 Dec 2012 08:32:59 -0500 Received: from greensocs.com ([87.106.252.221]:54756 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tgy2r-0007B8-Cr for qemu-devel@nongnu.org; Fri, 07 Dec 2012 08:32:49 -0500 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id 775C0439E22; Fri, 7 Dec 2012 13:32:48 +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 6NcAggTrKwmk; Fri, 7 Dec 2012 14:32:48 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 24247439E23; Fri, 7 Dec 2012 14:32:48 +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 35DEA439E21; Fri, 7 Dec 2012 14:32:47 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org Date: Fri, 7 Dec 2012 14:32:33 +0100 Message-Id: <1354887155-32281-5-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1354887155-32281-1-git-send-email-fred.konrad@greensocs.com> References: <1354887155-32281-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: peter.maydell@linaro.org, aliguori@us.ibm.com, e.voevodin@samsung.com, mark.burton@greensocs.com, stefanha@redhat.com, cornelia.huck@de.ibm.com, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [RFC PATCH v6 4/6] virtio-pci : Refactor virtio-pci 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 the virtio-pci device. This transport device will create a virtio-pci-bus, so one VirtIODevice can be connected. Signed-off-by: KONRAD Frederic --- hw/virtio-pci.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/virtio-pci.h | 14 +++++++ 2 files changed, 126 insertions(+) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 5ac8d0d..ff0b5f1 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -1119,6 +1119,115 @@ static TypeInfo virtio_scsi_info = { .class_init = virtio_scsi_class_init, }; +/* + * virtio-pci : This is the PCIDevice which have a virtio-pci-bus. + */ + +/* This is called by virtio-bus just after the device is plugged. */ +static void virtio_pci_device_plugged(void *opaque) +{ + VirtIOPCIProxy *proxy = VIRTIO_PCI(opaque); + uint8_t *config; + uint32_t size; + + /* Put the PCI IDs */ + switch (get_virtio_device_id(proxy->bus)) { + + case VIRTIO_ID_BLOCK: + pci_config_set_device_id(proxy->pci_dev.config, + PCI_DEVICE_ID_VIRTIO_BLOCK); + pci_config_set_class(proxy->pci_dev.config, PCI_CLASS_STORAGE_SCSI); + break; + default: + error_report("unknown device id\n"); + break; + + } + + /* TODO: vdev should be accessed through virtio-bus functions. */ + proxy->vdev = proxy->bus->vdev; + config = proxy->pci_dev.config; + + if (proxy->class_code) { + pci_config_set_class(config, proxy->class_code); + } + pci_set_word(config + PCI_SUBSYSTEM_VENDOR_ID, + pci_get_word(config + PCI_VENDOR_ID)); + pci_set_word(config + PCI_SUBSYSTEM_ID, get_virtio_device_id(proxy->bus)); + config[PCI_INTERRUPT_PIN] = 1; + + if (proxy->bus->vdev->nvectors && + msix_init_exclusive_bar(&proxy->pci_dev, proxy->bus->vdev->nvectors, + 1)) { + proxy->bus->vdev->nvectors = 0; + } + + proxy->pci_dev.config_write = virtio_write_config; + + size = VIRTIO_PCI_REGION_SIZE(&proxy->pci_dev) + + proxy->bus->vdev->config_len; + if (size & (size-1)) { + size = 1 << qemu_fls(size); + } + + memory_region_init_io(&proxy->bar, &virtio_pci_config_ops, proxy, + "virtio-pci", size); + pci_register_bar(&proxy->pci_dev, 0, PCI_BASE_ADDRESS_SPACE_IO, + &proxy->bar); + + if (!kvm_has_many_ioeventfds()) { + proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD; + } + + proxy->host_features |= 0x1 << VIRTIO_F_NOTIFY_ON_EMPTY; + proxy->host_features |= 0x1 << VIRTIO_F_BAD_FEATURE; + proxy->host_features = proxy->bus->vdev->get_features(proxy->bus->vdev, + proxy->host_features); +} + +/* This is called by virtio-bus just before the device is unplugged. */ +static void virtio_pci_device_unplug(void *opaque) +{ + VirtIOPCIProxy *dev = VIRTIO_PCI(opaque); + virtio_pci_stop_ioeventfd(dev); +} + +static int virtio_pci_init(PCIDevice *pci_dev) +{ + VirtIOPCIProxy *dev = VIRTIO_PCI(pci_dev); + dev->bus = virtio_pci_bus_new(dev); + return 0; +} + +static void virtio_pci_exit(PCIDevice *pci_dev) +{ + DeviceState *qdev = DEVICE(pci_dev); + BusState *qbus = BUS(qdev_get_parent_bus(qdev)); + VirtioBusState *bus = VIRTIO_BUS(qbus); + virtio_bus_destroy_device(bus); + qbus_free(qbus); +} + +static void virtio_pci_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + + k->init = virtio_pci_init; + k->exit = virtio_pci_exit; + k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET; + k->revision = VIRTIO_PCI_ABI_VERSION; + k->class_id = PCI_CLASS_OTHERS; + dc->reset = virtio_pci_reset; +} + +static const TypeInfo virtio_pci_info = { + .name = TYPE_VIRTIO_PCI, + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(VirtIOPCIProxy), + .class_init = virtio_pci_class_init, +}; + /* virtio-pci-bus */ VirtioBusState *virtio_pci_bus_new(VirtIOPCIProxy *dev) @@ -1145,6 +1254,8 @@ static void virtio_pci_bus_class_init(ObjectClass *klass, void *data) k->set_host_notifier = virtio_pci_set_host_notifier; k->set_guest_notifiers = virtio_pci_set_guest_notifiers; k->vmstate_change = virtio_pci_vmstate_change; + k->device_plugged = virtio_pci_device_plugged; + k->device_unplug = virtio_pci_device_unplug; } static const TypeInfo virtio_pci_bus_info = { @@ -1163,6 +1274,7 @@ static void virtio_pci_register_types(void) type_register_static(&virtio_scsi_info); type_register_static(&virtio_rng_info); type_register_static(&virtio_pci_bus_info); + type_register_static(&virtio_pci_info); } type_init(virtio_pci_register_types) diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h index 0e3288e..2c31b7a 100644 --- a/hw/virtio-pci.h +++ b/hw/virtio-pci.h @@ -46,6 +46,17 @@ typedef struct { unsigned int users; } VirtIOIRQFD; +/* + * virtio-pci : This is the PCIDevice which have a virtio-pci-bus. + */ +#define TYPE_VIRTIO_PCI "virtio-pci" +#define VIRTIO_PCI_GET_CLASS(obj) \ + OBJECT_GET_CLASS(VirtioPCIClass, obj, TYPE_VIRTIO_PCI) +#define VIRTIO_PCI_CLASS(klass) \ + OBJECT_CLASS_CHECK(VirtioPCIClass, klass, TYPE_VIRTIO_PCI) +#define VIRTIO_PCI(obj) \ + OBJECT_CHECK(VirtIOPCIProxy, (obj), TYPE_VIRTIO_PCI) + struct VirtIOPCIProxy { PCIDevice pci_dev; VirtIODevice *vdev; @@ -66,6 +77,9 @@ struct VirtIOPCIProxy { bool ioeventfd_disabled; bool ioeventfd_started; VirtIOIRQFD *vector_irqfd; + /* That's the virtio-bus on which VirtioDevice will be connected. */ + VirtioBusState *bus; + /* Nothing more for the moment. */ }; void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev);