Commit 165b244b authored by xiaoqiang zhao's avatar xiaoqiang zhao Committed by Michael Walle
Browse files

hw/display: QOM'ify milkymist-vgafb.c 



* Drop the old SysBus init function and use instance_init
* Move graphic_console_init into realize stage

Signed-off-by: default avatarxiaoqiang zhao <zxq_yx_007@163.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Acked-by: default avatarMichael Walle <michael@walle.cc>
Tested-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarMichael Walle <michael@walle.cc>
parent cf79c64d

hw/display/milkymist-vgafb.c

+10 −6
Original line number Diff line number Diff line
@@ -292,17 +292,21 @@ static const GraphicHwOps vgafb_ops = { 
    .gfx_update  = vgafb_update_display,

};



static int milkymist_vgafb_init(SysBusDevice *dev)

static void milkymist_vgafb_init(Object *obj)

{

    MilkymistVgafbState *s = MILKYMIST_VGAFB(dev);

    MilkymistVgafbState *s = MILKYMIST_VGAFB(obj);

    SysBusDevice *dev = SYS_BUS_DEVICE(obj);



    memory_region_init_io(&s->regs_region, OBJECT(s), &vgafb_mmio_ops, s,

            "milkymist-vgafb", R_MAX * 4);

    sysbus_init_mmio(dev, &s->regs_region);

}



    s->con = graphic_console_init(DEVICE(dev), 0, &vgafb_ops, s);

static void milkymist_vgafb_realize(DeviceState *dev, Error **errp)

{

    MilkymistVgafbState *s = MILKYMIST_VGAFB(dev);



    return 0;

    s->con = graphic_console_init(dev, 0, &vgafb_ops, s);

}



static int vgafb_post_load(void *opaque, int version_id)
@@ -331,18 +335,18 @@ static Property milkymist_vgafb_properties[] = { 
static void milkymist_vgafb_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = milkymist_vgafb_init;

    dc->reset = milkymist_vgafb_reset;

    dc->vmsd = &vmstate_milkymist_vgafb;

    dc->props = milkymist_vgafb_properties;

    dc->realize = milkymist_vgafb_realize;

}



static const TypeInfo milkymist_vgafb_info = {

    .name          = TYPE_MILKYMIST_VGAFB,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(MilkymistVgafbState),

    .instance_init = milkymist_vgafb_init,

    .class_init    = milkymist_vgafb_class_init,

};