From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TupTP-0005iM-Oi for qemu-devel@nongnu.org; Mon, 14 Jan 2013 14:13:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TupTK-0004We-3q for qemu-devel@nongnu.org; Mon, 14 Jan 2013 14:13:31 -0500 Received: from e7.ny.us.ibm.com ([32.97.182.137]:47589) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TupTJ-0004Wa-Vu for qemu-devel@nongnu.org; Mon, 14 Jan 2013 14:13:26 -0500 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 14 Jan 2013 14:13:25 -0500 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 523B76E8057 for ; Mon, 14 Jan 2013 14:13:22 -0500 (EST) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r0EJDNBk310148 for ; Mon, 14 Jan 2013 14:13:23 -0500 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r0EJDMCT006725 for ; Mon, 14 Jan 2013 14:13:22 -0500 From: Anthony Liguori In-Reply-To: <1357747019-20580-6-git-send-email-fred.konrad@greensocs.com> References: <1357747019-20580-1-git-send-email-fred.konrad@greensocs.com> <1357747019-20580-6-git-send-email-fred.konrad@greensocs.com> Date: Mon, 14 Jan 2013 13:13:15 -0600 Message-ID: <877gnfwpbo.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH V2 5/7] virtio-pci: refactor virtio-pci device. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: fred.konrad@greensocs.com, qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, e.voevodin@samsung.com, mst@redhat.com, mark.burton@greensocs.com, agraf@suse.de, cornelia.huck@de.ibm.com, aneesh.kumar@linux.vnet.ibm.com, stefanha@redhat.com, amit.shah@redhat.com, pbonzini@redhat.com, afaerber@suse.de fred.konrad@greensocs.com writes: > 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 virtio-pci should be abstract... > --- > hw/virtio-pci.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > hw/virtio-pci.h | 18 ++++++++ > 2 files changed, 145 insertions(+) > > diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c > index 090dc41..8598aee 100644 > --- a/hw/virtio-pci.c > +++ b/hw/virtio-pci.c > @@ -1163,6 +1163,130 @@ static TypeInfo virtio_scsi_info = { > .class_init = virtio_scsi_class_init, > }; > > +/* > + * virtio-pci: This is the PCIDevice which has a virtio-pci-bus. > + */ > + > +/* This is called by virtio-bus just after the device is plugged. */ > +static void virtio_pci_device_plugged(DeviceState *d) > +{ > + VirtIOPCIProxy *proxy = VIRTIO_PCI(d); > + VirtioBusState *bus = proxy->bus; > + uint8_t *config; > + uint32_t size; > + uint16_t device_id = 0; > + uint16_t class_id = 0; > + > + switch (virtio_device_get_id(proxy->bus)) { > + default: > + error_report("unknown device id\n"); > + break; > + } And this chunk should die. Let's avoid having two ways of specifying virtio-pci devices. Regards, Anthony Liguori > + pci_config_set_device_id(proxy->pci_dev.config, device_id); > + pci_config_set_class(proxy->pci_dev.config, class_id); > + > + 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, virtio_device_get_id(proxy->bus)); > + config[PCI_INTERRUPT_PIN] = 1; > + > + if (proxy->nvectors && > + msix_init_exclusive_bar(&proxy->pci_dev, proxy->nvectors, 1)) { > + proxy->nvectors = 0; > + } > + > + proxy->pci_dev.config_write = virtio_write_config; > + > + size = VIRTIO_PCI_REGION_SIZE(&proxy->pci_dev) > + + virtio_device_get_config_len(bus); > + 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 = virtio_device_get_features(bus, > + proxy->host_features); > +} > + > +/* This is called by virtio-bus just before the device is unplugged. */ > +static void virtio_pci_device_unplug(DeviceState *d) > +{ > + VirtIOPCIProxy *dev = VIRTIO_PCI(d); > + virtio_pci_stop_ioeventfd(dev); > +} > + > +static int virtio_pci_init(PCIDevice *pci_dev) > +{ > + VirtIOPCIProxy *dev = VIRTIO_PCI(pci_dev); > + VirtioPCIClass *k = VIRTIO_PCI_GET_CLASS(pci_dev); > + dev->bus = virtio_pci_bus_new(dev); > + if (k->init != NULL) { > + return k->init(dev); > + } > + return 0; > +} > + > +static void virtio_pci_exit(PCIDevice *pci_dev) > +{ > + VirtIOPCIProxy *proxy = VIRTIO_PCI(pci_dev); > + VirtioBusState *bus = VIRTIO_BUS(proxy->bus); > + BusState *qbus = BUS(proxy->bus); > + virtio_bus_destroy_device(bus); > + qbus_free(qbus); > + virtio_exit_pci(pci_dev); > +} > + > +/* > + * This will be renamed virtio_pci_reset at the end of the series. > + * virtio_pci_reset is still in use at this moment. > + */ > +static void virtio_pci_rst(DeviceState *qdev) > +{ > + VirtIOPCIProxy *proxy = VIRTIO_PCI(qdev); > + VirtioBusState *bus = VIRTIO_BUS(proxy->bus); > + virtio_pci_stop_ioeventfd(proxy); > + virtio_bus_reset(bus); > + msix_unuse_all_vectors(&proxy->pci_dev); > + proxy->flags &= ~VIRTIO_PCI_FLAG_BUS_MASTER_BUG; > +} > + > +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_rst; > +} > + > +static const TypeInfo virtio_pci_info = { > + .name = TYPE_VIRTIO_PCI, > + .parent = TYPE_PCI_DEVICE, > + .instance_size = sizeof(VirtIOPCIProxy), > + .class_init = virtio_pci_class_init, > + .class_size = sizeof(VirtioPCIClass), > +}; > + > /* virtio-pci-bus */ > > VirtioBusState *virtio_pci_bus_new(VirtIOPCIProxy *dev) > @@ -1189,6 +1313,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 = { > @@ -1207,6 +1333,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 ed0097f..f05f63c 100644 > --- a/hw/virtio-pci.h > +++ b/hw/virtio-pci.h > @@ -50,6 +50,22 @@ typedef struct { > unsigned int users; > } VirtIOIRQFD; > > +/* > + * virtio-pci: This is the PCIDevice which has 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) > + > +typedef struct VirtioPCIClass { > + PCIDeviceClass parent_class; > + int (*init)(VirtIOPCIProxy *vpci_dev); > +} VirtioPCIClass; > + > struct VirtIOPCIProxy { > PCIDevice pci_dev; > VirtIODevice *vdev; > @@ -70,6 +86,8 @@ struct VirtIOPCIProxy { > bool ioeventfd_disabled; > bool ioeventfd_started; > VirtIOIRQFD *vector_irqfd; > + /* That's the virtio-bus on which VirtioDevice will be connected. */ > + VirtioBusState *bus; > }; > > void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev); > -- > 1.7.11.7