| Message ID | 20181001220942.2382-4-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | another SysBusDevice::init to Device::realize cleanup | expand |
On 2018-10-02 00:09, Philippe Mathieu-Daudé wrote: > Move from the legacy SysBusDevice::init method to using DeviceState::realize. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/timer/sun4v-rtc.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/hw/timer/sun4v-rtc.c b/hw/timer/sun4v-rtc.c > index 13be94f8da..4e7f6a1eff 100644 > --- a/hw/timer/sun4v-rtc.c > +++ b/hw/timer/sun4v-rtc.c > @@ -63,21 +63,21 @@ void sun4v_rtc_init(hwaddr addr) > sysbus_mmio_map(s, 0, addr); > } > > -static int sun4v_rtc_init1(SysBusDevice *dev) > +static void sun4v_rtc_realize(DeviceState *dev, Error **errp) > { > + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); > Sun4vRtc *s = SUN4V_RTC(dev); > > memory_region_init_io(&s->iomem, OBJECT(s), &sun4v_rtc_ops, s, > "sun4v-rtc", 0x08ULL); > - sysbus_init_mmio(dev, &s->iomem); > - return 0; > + sysbus_init_mmio(sbd, &s->iomem); > } > > static void sun4v_rtc_class_init(ObjectClass *klass, void *data) > { > - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); > + DeviceClass *dc = DEVICE_CLASS(klass); > > - k->init = sun4v_rtc_init1; > + dc->realize = sun4v_rtc_realize; > } > > static const TypeInfo sun4v_rtc_info = { Reviewed-by: Thomas Huth <thuth@redhat.com>
On 10/2/18 12:09 AM, Philippe Mathieu-Daudé wrote: > Move from the legacy SysBusDevice::init method to using DeviceState::realize. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > hw/timer/sun4v-rtc.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/hw/timer/sun4v-rtc.c b/hw/timer/sun4v-rtc.c > index 13be94f8da..4e7f6a1eff 100644 > --- a/hw/timer/sun4v-rtc.c > +++ b/hw/timer/sun4v-rtc.c > @@ -63,21 +63,21 @@ void sun4v_rtc_init(hwaddr addr) > sysbus_mmio_map(s, 0, addr); > } > > -static int sun4v_rtc_init1(SysBusDevice *dev) > +static void sun4v_rtc_realize(DeviceState *dev, Error **errp) > { > + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); > Sun4vRtc *s = SUN4V_RTC(dev); > > memory_region_init_io(&s->iomem, OBJECT(s), &sun4v_rtc_ops, s, > "sun4v-rtc", 0x08ULL); > - sysbus_init_mmio(dev, &s->iomem); > - return 0; > + sysbus_init_mmio(sbd, &s->iomem); > } > > static void sun4v_rtc_class_init(ObjectClass *klass, void *data) > { > - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); > + DeviceClass *dc = DEVICE_CLASS(klass); > > - k->init = sun4v_rtc_init1; > + dc->realize = sun4v_rtc_realize; > } > > static const TypeInfo sun4v_rtc_info = { >
diff --git a/hw/timer/sun4v-rtc.c b/hw/timer/sun4v-rtc.c index 13be94f8da..4e7f6a1eff 100644 --- a/hw/timer/sun4v-rtc.c +++ b/hw/timer/sun4v-rtc.c @@ -63,21 +63,21 @@ void sun4v_rtc_init(hwaddr addr) sysbus_mmio_map(s, 0, addr); } -static int sun4v_rtc_init1(SysBusDevice *dev) +static void sun4v_rtc_realize(DeviceState *dev, Error **errp) { + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); Sun4vRtc *s = SUN4V_RTC(dev); memory_region_init_io(&s->iomem, OBJECT(s), &sun4v_rtc_ops, s, "sun4v-rtc", 0x08ULL); - sysbus_init_mmio(dev, &s->iomem); - return 0; + sysbus_init_mmio(sbd, &s->iomem); } static void sun4v_rtc_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc = DEVICE_CLASS(klass); - k->init = sun4v_rtc_init1; + dc->realize = sun4v_rtc_realize; } static const TypeInfo sun4v_rtc_info = {
Move from the legacy SysBusDevice::init method to using DeviceState::realize. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/timer/sun4v-rtc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)