Re: [Qemu-devel] [PATCH V2 4/7] virtio-pci-bus: introduce virtio-pci-bus.

[KONRAD Frédéric]

On 14/01/2013 20:08, Anthony Liguori wrote:
> address@hidden writes:
>
> > From: KONRAD Frederic <address@hidden>
> >
> > Introduce virtio-pci-bus, which extends virtio-bus. It is used with virtio-pci
> > transport device.
> >
> > Signed-off-by: KONRAD Frederic <address@hidden>
> > ---
> >   hw/virtio-pci.c | 37 +++++++++++++++++++++++++++++++++++++
> >   hw/virtio-pci.h | 23 +++++++++++++++++++++--
> >   2 files changed, 58 insertions(+), 2 deletions(-)
> >
> > diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
> > index c7f0c4d..090dc41 100644
> > --- a/hw/virtio-pci.c
> > +++ b/hw/virtio-pci.c
> > @@ -31,6 +31,7 @@
> >   #include "sysemu/blockdev.h"
> >   #include "virtio-pci.h"
> >   #include "qemu/range.h"
> > +#include "virtio-bus.h"
> >   
> >   /* from Linux's linux/virtio_pci.h */
> >   
> > @@ -1162,6 +1163,41 @@ static TypeInfo virtio_scsi_info = {
> >       .class_init    = virtio_scsi_class_init,
> >   };
> >   
> > +/* virtio-pci-bus */
> > +
> > +VirtioBusState *virtio_pci_bus_new(VirtIOPCIProxy *dev)
> > +{
> > +    DeviceState *qdev = DEVICE(dev);
> > +    BusState *qbus = qbus_create(TYPE_VIRTIO_PCI_BUS, qdev, NULL);
> > +    VirtioBusState *bus = VIRTIO_BUS(qbus);
> > +    qbus->allow_hotplug = 0;
> Any reason to not use a qbus_create_inplace()?
>
> Regards,
>
> Anthony Liguori
If I change the bus field of VirtIOPCIProxy from VirtioBus* to VirtioBus 
and I use qbus_create_inplace
I can't use qbus_create_inplace(BUS(&dev->bus),...) as the object is not 
initialised yet right?

> > +    return bus;
> > +}
> > +
> > +static void virtio_pci_bus_class_init(ObjectClass *klass, void *data)
> > +{
> > +    BusClass *bus_class = BUS_CLASS(klass);
> > +    VirtioBusClass *k = VIRTIO_BUS_CLASS(klass);
> > +    bus_class->max_dev = 1;
> > +    k->notify = virtio_pci_notify;
> > +    k->save_config = virtio_pci_save_config;
> > +    k->load_config = virtio_pci_load_config;
> > +    k->save_queue = virtio_pci_save_queue;
> > +    k->load_queue = virtio_pci_load_queue;
> > +    k->get_features = virtio_pci_get_features;
> > +    k->query_guest_notifiers = virtio_pci_query_guest_notifiers;
> > +    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;
> > +}
> > +
> > +static const TypeInfo virtio_pci_bus_info = {
> > +    .name          = TYPE_VIRTIO_PCI_BUS,
> > +    .parent        = TYPE_VIRTIO_BUS,
> > +    .instance_size = sizeof(VirtioPCIBusState),
> > +    .class_init    = virtio_pci_bus_class_init,
> > +};
> > +
> >   static void virtio_pci_register_types(void)
> >   {
> >       type_register_static(&virtio_blk_info);
> > @@ -1170,6 +1206,7 @@ static void virtio_pci_register_types(void)
> >       type_register_static(&virtio_balloon_info);
> >       type_register_static(&virtio_scsi_info);
> >       type_register_static(&virtio_rng_info);
> > +    type_register_static(&virtio_pci_bus_info);
> >   }
> >   
> >   type_init(virtio_pci_register_types)
> > diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h
> > index b58d9a2..ed0097f 100644
> > --- a/hw/virtio-pci.h
> > +++ b/hw/virtio-pci.h
> > @@ -20,6 +20,25 @@
> >   #include "virtio-rng.h"
> >   #include "virtio-serial.h"
> >   #include "virtio-scsi.h"
> > +#include "virtio-bus.h"
> > +
> > +typedef struct VirtIOPCIProxy VirtIOPCIProxy;
> > +
> > +/* virtio-pci-bus */
> > +
> > +typedef struct VirtioBusState VirtioPCIBusState;
> > +typedef struct VirtioBusClass VirtioPCIBusClass;
> > +
> > +#define TYPE_VIRTIO_PCI_BUS "virtio-pci-bus"
> > +#define VIRTIO_PCI_BUS(obj) \
> > +        OBJECT_CHECK(VirtioPCIBusState, (obj), TYPE_VIRTIO_PCI_BUS)
> > +#define VIRTIO_PCI_BUS_GET_CLASS(obj) \
> > +        OBJECT_GET_CLASS(VirtioPCIBusClass, obj, TYPE_VIRTIO_PCI_BUS)
> > +#define VIRTIO_PCI_BUS_CLASS(klass) \
> > +        OBJECT_CLASS_CHECK(VirtioPCIBusClass, klass, TYPE_VIRTIO_PCI_BUS)
> > +
> > +
> > +VirtioBusState *virtio_pci_bus_new(VirtIOPCIProxy *dev);
> >   
> >   /* Performance improves when virtqueue kick processing is decoupled from the
> >    * vcpu thread using ioeventfd for some devices. */
> > @@ -31,7 +50,7 @@ typedef struct {
> >       unsigned int users;
> >   } VirtIOIRQFD;
> >   
> > -typedef struct {
> > +struct VirtIOPCIProxy {
> >       PCIDevice pci_dev;
> >       VirtIODevice *vdev;
> >       MemoryRegion bar;
> > @@ -51,7 +70,7 @@ typedef struct {
> >       bool ioeventfd_disabled;
> >       bool ioeventfd_started;
> >       VirtIOIRQFD *vector_irqfd;
> > -} VirtIOPCIProxy;
> > +};
> >   
> >   void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev);
> >   void virtio_pci_reset(DeviceState *d);
> > --
> > 1.7.11.7