diff options
| author | xiaoqiang zhao <zxq_yx_007@163.com> | 2017-01-06 08:26:26 +0800 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2017-01-31 10:10:13 +1100 |
| commit | d0c2b0d089898b261179c5daac0db291aded3389 (patch) | |
| tree | 6c57fcc6d66c40dbac3f719141881829e04980f8 /hw/ppc/e500.c | |
| parent | 396781f62739329263651ebfe50c4f98a821f721 (diff) | |
| download | qemu-d0c2b0d089898b261179c5daac0db291aded3389.zip qemu-d0c2b0d089898b261179c5daac0db291aded3389.tar.gz qemu-d0c2b0d089898b261179c5daac0db291aded3389.tar.bz2 | |
hw/ppc: QOM'ify e500.c
Drop the old SysBus init function and use instance_init
Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/ppc/e500.c')
| -rw-r--r-- | hw/ppc/e500.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index cf8b122..792bd79 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -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) |