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

hw/ppc: QOM'ify ppce500_spin.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>
This commit is contained in:
xiaoqiang zhao 2017-01-06 08:26:27 +08:00 committed by David Gibson
parent d0c2b0d089
commit 09a7eb978f
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/ppc/ppce500_spin.c
View File

@ -54,9 +54,9 @@ typedef struct SpinState {
SpinInfo spin[MAX_CPUS]; SpinInfo spin[MAX_CPUS];
} SpinState; } SpinState;
static void spin_reset(void *opaque) static void spin_reset(DeviceState *dev)
{ {
SpinState *s = opaque; SpinState *s = E500_SPIN(dev);
int i; int i;
for (i = 0; i < MAX_CPUS; i++) { for (i = 0; i < MAX_CPUS; i++) {
@ -174,30 +174,28 @@ static const MemoryRegionOps spin_rw_ops = {
.endianness = DEVICE_BIG_ENDIAN, .endianness = DEVICE_BIG_ENDIAN,
}; };
static int ppce500_spin_initfn(SysBusDevice *dev) static void ppce500_spin_initfn(Object *obj)
{ {
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
SpinState *s = E500_SPIN(dev); SpinState *s = E500_SPIN(dev);
memory_region_init_io(&s->iomem, OBJECT(s), &spin_rw_ops, s, memory_region_init_io(&s->iomem, obj, &spin_rw_ops, s,
"e500 spin pv device", sizeof(SpinInfo) * MAX_CPUS); "e500 spin pv device", sizeof(SpinInfo) * MAX_CPUS);
sysbus_init_mmio(dev, &s->iomem); sysbus_init_mmio(dev, &s->iomem);
qemu_register_reset(spin_reset, s);
return 0;
} }
static void ppce500_spin_class_init(ObjectClass *klass, void *data) static void ppce500_spin_class_init(ObjectClass *klass, void *data)
{ {
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
k->init = ppce500_spin_initfn; dc->reset = spin_reset;
} }
static const TypeInfo ppce500_spin_info = { static const TypeInfo ppce500_spin_info = {
.name = TYPE_E500_SPIN, .name = TYPE_E500_SPIN,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(SpinState), .instance_size = sizeof(SpinState),
.instance_init = ppce500_spin_initfn,
.class_init = ppce500_spin_class_init, .class_init = ppce500_spin_class_init,
}; };