mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/sparc64: QOM'ify sun4u.c

Browse Source 
Drop the old SysBusDeviceClass::init and use instance_init
or DeviceClass::realize instead

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
xiaoqiang zhao 2017-05-25 21:34:51 +08:00 committed by Mark Cave-Ayland
parent dc8b6dd984
commit 78fb261db1
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/sparc64/sun4u.c
View File

@ -329,16 +329,16 @@ static void prom_init(hwaddr addr, const char *bios_name)
} }
} }
static int prom_init1(SysBusDevice *dev) static void prom_init1(Object *obj)
{ {
PROMState *s = OPENPROM(dev); PROMState *s = OPENPROM(obj);
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
memory_region_init_ram(&s->prom, OBJECT(s), "sun4u.prom", PROM_SIZE_MAX, memory_region_init_ram(&s->prom, obj, "sun4u.prom", PROM_SIZE_MAX,
&error_fatal); &error_fatal);
vmstate_register_ram_global(&s->prom); vmstate_register_ram_global(&s->prom);
memory_region_set_readonly(&s->prom, true); memory_region_set_readonly(&s->prom, true);
sysbus_init_mmio(dev, &s->prom); sysbus_init_mmio(dev, &s->prom);
return 0;
} }
static Property prom_properties[] = { static Property prom_properties[] = {
@ -348,9 +348,7 @@ static Property prom_properties[] = {
static void prom_class_init(ObjectClass *klass, void *data) static void prom_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = prom_init1;
dc->props = prom_properties; dc->props = prom_properties;
} }
@ -359,6 +357,7 @@ static const TypeInfo prom_info = {
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(PROMState), .instance_size = sizeof(PROMState),
.class_init = prom_class_init, .class_init = prom_class_init,
.instance_init = prom_init1,
}; };
@ -373,15 +372,15 @@ typedef struct RamDevice {
} RamDevice; } RamDevice;
/* System RAM */ /* System RAM */
static int ram_init1(SysBusDevice *dev) static void ram_realize(DeviceState *dev, Error **errp)
{ {
RamDevice *d = SUN4U_RAM(dev); RamDevice *d = SUN4U_RAM(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
memory_region_init_ram(&d->ram, OBJECT(d), "sun4u.ram", d->size, memory_region_init_ram(&d->ram, OBJECT(d), "sun4u.ram", d->size,
&error_fatal); &error_fatal);
vmstate_register_ram_global(&d->ram); vmstate_register_ram_global(&d->ram);
sysbus_init_mmio(dev, &d->ram); sysbus_init_mmio(sbd, &d->ram);
return 0;
} }
static void ram_init(hwaddr addr, ram_addr_t RAM_size) static void ram_init(hwaddr addr, ram_addr_t RAM_size)
@ -409,9 +408,8 @@ static Property ram_properties[] = {
static void ram_class_init(ObjectClass *klass, void *data) static void ram_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = ram_init1; dc->realize = ram_realize;
dc->props = ram_properties; dc->props = ram_properties;
} }