Re: [Qemu-devel] [RFC PATCH V8 04/15] virtio-pci : Refactor virtio-pci device.

["KONRAD Frédéric" <fred.konrad@greensocs.com>]

On 02/01/2013 15:14, Anthony Liguori wrote:
> fred.konrad@greensocs.com writes:
>
>> From: KONRAD Frederic <fred.konrad@greensocs.com>
>>
>> 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 <fred.konrad@greensocs.com>
>> ---
>>   hw/virtio-pci.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>>   hw/virtio-pci.h |  19 +++++++++
>>   2 files changed, 149 insertions(+)
>>
>> diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
>> index 859a1ed..916ed7c 100644
>> --- a/hw/virtio-pci.c
>> +++ b/hw/virtio-pci.c
>> @@ -1118,6 +1118,133 @@ 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);
>> +    VirtioBusState *bus = proxy->bus;
>> +    uint8_t *config;
>> +    uint32_t size;
>> +
>> +    /* Put the PCI IDs */
>> +    switch (get_virtio_device_id(proxy->bus)) {
>> +
>> +
>> +    default:
>> +        error_report("unknown device id\n");
>> +    break;
>> +
>> +    }
>> +
>> +    /*
>> +     * vdev shouldn't be accessed directly by virtio-pci.
>> +     * We will remove that at the end of the series to keep virtio-x-pci
>> +     * working.
>> +     */
>> +    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 (get_virtio_device_nvectors(bus) &&
>> +        msix_init_exclusive_bar(&proxy->pci_dev,
>> +                                get_virtio_device_nvectors(bus), 1)) {
>> +        set_virtio_device_nvectors(bus, 0);
>> +    }
>> +
>> +    proxy->pci_dev.config_write = virtio_write_config;
>> +
>> +    size = VIRTIO_PCI_REGION_SIZE(&proxy->pci_dev)
>> +         + get_virtio_device_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 = get_virtio_device_features(bus,
>> +                                                      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);
>> +    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);
>> +}
>> +
>> +static void virtio_pci_rst(DeviceState *qdev)
> s/rst/reset/
>
> Regards,
>
> Anthony Liguori
virtio_pci_reset conflicts with another function.
Can I add a step to renamed it at the end when virtio_pci_reset is unused ?

>
>> +{
>> +    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)
>> @@ -1144,6 +1271,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 = {
>> @@ -1162,6 +1291,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..e840cea 100644
>> --- a/hw/virtio-pci.h
>> +++ b/hw/virtio-pci.h
>> @@ -46,6 +46,22 @@ 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)
>> +
>> +typedef struct VirtioPCIClass {
>> +    PCIDeviceClass parent_class;
>> +    int (*init)(VirtIOPCIProxy *vpci_dev);
>> +} VirtioPCIClass;
>> +
>>   struct VirtIOPCIProxy {
>>       PCIDevice pci_dev;
>>       VirtIODevice *vdev;
>> @@ -66,6 +82,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. */
>>   }; c
>>   
>>   void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev);
>> -- 
>> 1.7.11.7