Re: [Qemu-devel] [RFC PATCH V8 06/15] virtio-s390-bus : Add virtio-s390-bus.

[KONRAD Frédéric]

On 19/12/2012 19:09, Cornelia Huck wrote:
> On Wed, 19 Dec 2012 10:53:32 +0100
> address@hidden wrote:
>
> > From: KONRAD Frederic <address@hidden>
> >
> > Introduce virtio-s390-bus, which extends virtio-bus. It is used with s390
> > transport device.
> >
> > Signed-off-by: KONRAD Frederic <address@hidden>
> > ---
> >   hw/s390-virtio-bus.c | 28 ++++++++++++++++++++++++++++
> >   hw/s390-virtio-bus.h | 13 +++++++++++++
> >   2 files changed, 41 insertions(+)
> >
> > diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
> > index e0ac2d1..720dbb9 100644
> > --- a/hw/s390-virtio-bus.c
> > +++ b/hw/s390-virtio-bus.c
> > @@ -33,6 +33,7 @@
> >   #include "kvm.h"
> >
> >   #include "hw/s390-virtio-bus.h"
> > +#include "hw/virtio-bus.h"
> >
> >   /* #define DEBUG_S390 */
> >
> > @@ -556,8 +557,35 @@ static TypeInfo s390_virtio_bridge_info = {
> >       .class_init    = s390_virtio_bridge_class_init,
> >   };
> >
> > +/* virtio-s390-bus */
> > +
> > +VirtioBusState *virtio_s390_bus_new(VirtIOS390Device *dev)
> > +{
> > +    DeviceState *qdev = DEVICE(dev);
> > +    BusState *qbus = qbus_create(TYPE_VIRTIO_S390_BUS, qdev, NULL);
> > +    VirtioBusState *bus = VIRTIO_BUS(qbus);
> > +    qbus->allow_hotplug = 0;
> > +    qbus->max_dev = 1;
> > +    return bus;
> > +}
> > +
> > +static void virtio_s390_bus_class_init(ObjectClass *klass, void *data)
> > +{
> > +    VirtioBusClass *k = VIRTIO_BUS_CLASS(klass);
> > +    k->notify = virtio_s390_notify;
> > +    k->get_features = virtio_s390_get_features;
> > +}
> > +
> > +static const TypeInfo virtio_s390_bus_info = {
> > +    .name          = TYPE_VIRTIO_S390_BUS,
> > +    .parent        = TYPE_VIRTIO_BUS,
> > +    .instance_size = sizeof(VirtioBusState),
> > +    .class_init    = virtio_s390_bus_class_init,
> > +};
> > +
> >   static void s390_virtio_register_types(void)
> >   {
> > +    type_register_static(&virtio_s390_bus_info);
> >       type_register_static(&s390_virtio_bus_info);
> >       type_register_static(&virtio_s390_device_info);
> >       type_register_static(&s390_virtio_serial);
> > diff --git a/hw/s390-virtio-bus.h b/hw/s390-virtio-bus.h
> > index a83afe7..7c5a945 100644
> > --- a/hw/s390-virtio-bus.h
> > +++ b/hw/s390-virtio-bus.h
> > @@ -22,6 +22,7 @@
> >   #include "virtio-rng.h"
> >   #include "virtio-serial.h"
> >   #include "virtio-scsi.h"
> > +#include "virtio-bus.h"
> >
> >   #define VIRTIO_DEV_OFFS_TYPE          0       /* 8 bits */
> >   #define VIRTIO_DEV_OFFS_NUM_VQ                1       /* 8 bits */
> > @@ -57,8 +58,20 @@
> >   #define S390_VIRTIO_BUS(obj) \
> >        OBJECT_CHECK(VirtIOS390Bus, (obj), TYPE_S390_VIRTIO_BUS)
> >
> > +/* virtio-s390-bus */
> > +
> > +#define TYPE_VIRTIO_S390_BUS "virtio-s390-bus"
> > +#define VIRTIO_S390_BUS_GET_CLASS(obj) \
> > +        OBJECT_GET_CLASS(VirtioBusClass, obj, TYPE_VIRTIO_S390_BUS)
> > +#define VIRTIO_PCI_BUS_CLASS(klass) \
> > +        OBJECT_CLASS_CHECK(VirtioBusClass, klass, TYPE_VIRTIO_S390_BUS)
> > +#define VIRTIO_PCI_BUS(obj) \
> > +        OBJECT_CHECK(VirtioBusState, (obj), TYPE_VIRTIO_S390_BUS)
> PCI? This looks wrong.
oops, yes sorry for that.
It didn't complain as I don't use the VirtioBusClass for the moment.

I fixed it.

Thanks.
> > +
> >   typedef struct VirtIOS390Device VirtIOS390Device;
> >
> > +VirtioBusState *virtio_s390_bus_new(VirtIOS390Device *dev);
> > +
> >   typedef struct VirtIOS390DeviceClass {
> >       DeviceClass qdev;
> >       int (*init)(VirtIOS390Device *dev);