ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mpc8544_guts: Turn qdev initfn into instance_init 

SysBus can deal with NULL SysBusDeviceClass::init since 4ce5dae.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Andreas Färber 2013-06-09 22:47:35 +02:00 committed by Alexander Graf
parent 43f691e9e2
commit 7587ea5bcb
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/ppc/mpc8544_guts.c
View File

@ -114,29 +114,21 @@ static const MemoryRegionOps mpc8544_guts_ops = {
}, },
}; };
static int mpc8544_guts_initfn(SysBusDevice *dev) static void mpc8544_guts_initfn(Object *obj)
{ {
GutsState *s = MPC8544_GUTS(dev); SysBusDevice *d = SYS_BUS_DEVICE(obj);
GutsState *s = MPC8544_GUTS(obj);
memory_region_init_io(&s->iomem, &mpc8544_guts_ops, s, memory_region_init_io(&s->iomem, &mpc8544_guts_ops, s,
"mpc8544.guts", MPC8544_GUTS_MMIO_SIZE); "mpc8544.guts", MPC8544_GUTS_MMIO_SIZE);
sysbus_init_mmio(dev, &s->iomem); sysbus_init_mmio(d, &s->iomem);
return 0;
}
static void mpc8544_guts_class_init(ObjectClass *klass, void *data)
{
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = mpc8544_guts_initfn;
} }
static const TypeInfo mpc8544_guts_info = { static const TypeInfo mpc8544_guts_info = {
.name = TYPE_MPC8544_GUTS, .name = TYPE_MPC8544_GUTS,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(GutsState), .instance_size = sizeof(GutsState),
.class_init = mpc8544_guts_class_init, .instance_init = mpc8544_guts_initfn,
}; };
static void mpc8544_guts_register_types(void) static void mpc8544_guts_register_types(void)