Commit d0c2b0d0 authored by xiaoqiang zhao's avatar xiaoqiang zhao Committed by David Gibson
Browse files

hw/ppc: QOM'ify e500.c 



Drop the old SysBus init function and use instance_init

Signed-off-by: default avatarxiaoqiang zhao <zxq_yx_007@163.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 396781f6

hw/ppc/e500.c

+4 −13
Original line number Diff line number Diff line
@@ -1049,27 +1049,18 @@ void ppce500_init(MachineState *machine, PPCE500Params *params) 
    boot_info->dt_size = dt_size;

}



static int e500_ccsr_initfn(SysBusDevice *dev)

static void e500_ccsr_initfn(Object *obj)

{

    PPCE500CCSRState *ccsr;



    ccsr = CCSR(dev);

    memory_region_init(&ccsr->ccsr_space, OBJECT(ccsr), "e500-ccsr",

    PPCE500CCSRState *ccsr = CCSR(obj);

    memory_region_init(&ccsr->ccsr_space, obj, "e500-ccsr",

                       MPC8544_CCSRBAR_SIZE);

    return 0;

}



static void e500_ccsr_class_init(ObjectClass *klass, void *data)

{

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);

    k->init = e500_ccsr_initfn;

}



static const TypeInfo e500_ccsr_info = {

    .name          = TYPE_CCSR,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(PPCE500CCSRState),

    .class_init    = e500_ccsr_class_init,

    .instance_init = e500_ccsr_initfn,

};



static void e500_register_types(void)