Message ID | 20181119120820.29878-5-maozhongyi@cmss.chinamobile.com |
---|---|
State | New |
Headers | show |
Series | QOM'ify SysBusDeviceClass->init | expand |
On 19 November 2018 at 12:08, Mao Zhongyi <maozhongyi@cmss.chinamobile.com> wrote: > Use DeviceClass rather than SysBusDeviceClass in > empty_slot_class_init(). > > Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> > Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com> > --- > hw/core/empty_slot.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c > index c1b9c2b104..239f78e2a7 100644 > --- a/hw/core/empty_slot.c > +++ b/hw/core/empty_slot.c > @@ -71,21 +71,20 @@ void empty_slot_init(hwaddr addr, uint64_t slot_size) > } > } > > -static int empty_slot_init1(SysBusDevice *dev) > +static void empty_slot_realize(DeviceState *dev, Error **errp) > { > EmptySlot *s = EMPTY_SLOT(dev); > > memory_region_init_io(&s->iomem, OBJECT(s), &empty_slot_ops, s, > "empty-slot", s->size); > - sysbus_init_mmio(dev, &s->iomem); > - return 0; > + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); > } > > static void empty_slot_class_init(ObjectClass *klass, void *data) > { > - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); > + DeviceClass *dc = DEVICE_CLASS(klass); > > - k->init = empty_slot_init1; > + dc->realize = empty_slot_realize; > } > > static const TypeInfo empty_slot_info = { Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
On 19/11/18 13:08, Mao Zhongyi wrote: > Use DeviceClass rather than SysBusDeviceClass in > empty_slot_class_init(). > > Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> > Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/core/empty_slot.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c > index c1b9c2b104..239f78e2a7 100644 > --- a/hw/core/empty_slot.c > +++ b/hw/core/empty_slot.c > @@ -71,21 +71,20 @@ void empty_slot_init(hwaddr addr, uint64_t slot_size) > } > } > > -static int empty_slot_init1(SysBusDevice *dev) > +static void empty_slot_realize(DeviceState *dev, Error **errp) > { > EmptySlot *s = EMPTY_SLOT(dev); > > memory_region_init_io(&s->iomem, OBJECT(s), &empty_slot_ops, s, > "empty-slot", s->size); > - sysbus_init_mmio(dev, &s->iomem); > - return 0; > + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); > } > > static void empty_slot_class_init(ObjectClass *klass, void *data) > { > - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); > + DeviceClass *dc = DEVICE_CLASS(klass); > > - k->init = empty_slot_init1; > + dc->realize = empty_slot_realize; > } > > static const TypeInfo empty_slot_info = { >
diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c index c1b9c2b104..239f78e2a7 100644 --- a/hw/core/empty_slot.c +++ b/hw/core/empty_slot.c @@ -71,21 +71,20 @@ void empty_slot_init(hwaddr addr, uint64_t slot_size) } } -static int empty_slot_init1(SysBusDevice *dev) +static void empty_slot_realize(DeviceState *dev, Error **errp) { EmptySlot *s = EMPTY_SLOT(dev); memory_region_init_io(&s->iomem, OBJECT(s), &empty_slot_ops, s, "empty-slot", s->size); - sysbus_init_mmio(dev, &s->iomem); - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); } static void empty_slot_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc = DEVICE_CLASS(klass); - k->init = empty_slot_init1; + dc->realize = empty_slot_realize; } static const TypeInfo empty_slot_info = {