| Message ID | 20181130093852.20739-6-maozhongyi@cmss.chinamobile.com |
|---|---|
| State | New |
| Headers | show |
| Series | QOM'ify SysBusDeviceClass->init | expand |
On Fri, Nov 30, 2018 at 05:38:36PM +0800, Mao Zhongyi wrote: > Use DeviceClass rather than SysBusDeviceClass in > g364fb_sysbus_class_init(). > > Cc: pbonzini@redhat.com > Cc: kraxel@redhat.com > Cc: f4bug@amsat.org > Cc: alistair.francis@wdc.com > > Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com> > Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com> > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com> > --- > hw/display/g364fb.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c > index 8ad7e5d824..3407adf98d 100644 > --- a/hw/display/g364fb.c > +++ b/hw/display/g364fb.c > @@ -489,18 +489,16 @@ typedef struct { > G364State g364; > } G364SysBusState; > > -static int g364fb_sysbus_init(SysBusDevice *sbd) > +static void g364fb_sysbus_realize(DeviceState *dev, Error **errp) > { > - DeviceState *dev = DEVICE(sbd); > G364SysBusState *sbs = G364(dev); > G364State *s = &sbs->g364; > + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); > > g364fb_init(dev, s); > sysbus_init_irq(sbd, &s->irq); > sysbus_init_mmio(sbd, &s->mem_ctrl); > sysbus_init_mmio(sbd, &s->mem_vram); > - > - return 0; > } > > static void g364fb_sysbus_reset(DeviceState *d) > @@ -518,9 +516,8 @@ static Property g364fb_sysbus_properties[] = { > static void g364fb_sysbus_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); > > - k->init = g364fb_sysbus_init; > + dc->realize = g364fb_sysbus_realize; > set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); > dc->desc = "G364 framebuffer"; > dc->reset = g364fb_sysbus_reset; > -- > 2.17.1 > > >
diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 8ad7e5d824..3407adf98d 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -489,18 +489,16 @@ typedef struct { G364State g364; } G364SysBusState; -static int g364fb_sysbus_init(SysBusDevice *sbd) +static void g364fb_sysbus_realize(DeviceState *dev, Error **errp) { - DeviceState *dev = DEVICE(sbd); G364SysBusState *sbs = G364(dev); G364State *s = &sbs->g364; + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); g364fb_init(dev, s); sysbus_init_irq(sbd, &s->irq); sysbus_init_mmio(sbd, &s->mem_ctrl); sysbus_init_mmio(sbd, &s->mem_vram); - - return 0; } static void g364fb_sysbus_reset(DeviceState *d) @@ -518,9 +516,8 @@ static Property g364fb_sysbus_properties[] = { static void g364fb_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = g364fb_sysbus_init; + dc->realize = g364fb_sysbus_realize; set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); dc->desc = "G364 framebuffer"; dc->reset = g364fb_sysbus_reset;