[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH V2 5/7] virtio-pci: refactor virtio-pci device.
From: |
Anthony Liguori |
Subject: |
Re: [Qemu-devel] [PATCH V2 5/7] virtio-pci: refactor virtio-pci device. |
Date: |
Mon, 14 Jan 2013 13:13:15 -0600 |
User-agent: |
Notmuch/0.13.2+93~ged93d79 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) |
address@hidden writes:
> From: KONRAD Frederic <address@hidden>
>
> 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 <address@hidden>
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
- [Qemu-devel] [PATCH V2 0/7] Virtio-refactoring part1., fred . konrad, 2013/01/09
- [Qemu-devel] [PATCH V2 1/7] qdev: add a maximum device allowed field for the bus., fred . konrad, 2013/01/09
- [Qemu-devel] [PATCH V2 2/7] virtio-bus: introduce virtio-bus, fred . konrad, 2013/01/09
- [Qemu-devel] [PATCH V2 3/7] virtio-device: refactor virtio-device., fred . konrad, 2013/01/09
- [Qemu-devel] [PATCH V2 4/7] virtio-pci-bus: introduce virtio-pci-bus., fred . konrad, 2013/01/09
- [Qemu-devel] [PATCH V2 5/7] virtio-pci: refactor virtio-pci device., fred . konrad, 2013/01/09
- Re: [Qemu-devel] [PATCH V2 5/7] virtio-pci: refactor virtio-pci device.,
Anthony Liguori <=
- [Qemu-devel] [PATCH V2 7/7] virtio-s390-device: create a virtio-s390-bus during init., fred . konrad, 2013/01/09
- [Qemu-devel] [PATCH V2 6/7] virtio-s390-bus: add virtio-s390-bus., fred . konrad, 2013/01/09