[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 9/9] hw/sparc64: QOM'ify sun4u.c
From: |
xiaoqiang zhao |
Subject: |
[Qemu-devel] [PATCH 9/9] hw/sparc64: QOM'ify sun4u.c |
Date: |
Sun, 23 Oct 2016 14:31:35 +0800 |
Drop the old SysBusDeviceClass::init and use instance_init
or DeviceClass::realize instead
Signed-off-by: xiaoqiang zhao <address@hidden>
---
hw/sparc64/sun4u.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 3165e18..aac4cb5 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -651,16 +651,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);
vmstate_register_ram_global(&s->prom);
memory_region_set_readonly(&s->prom, true);
sysbus_init_mmio(dev, &s->prom);
- return 0;
}
static Property prom_properties[] = {
@@ -670,9 +670,7 @@ static Property prom_properties[] = {
static void prom_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = prom_init1;
dc->props = prom_properties;
}
@@ -681,6 +679,7 @@ static const TypeInfo prom_info = {
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(PROMState),
.class_init = prom_class_init,
+ .instance_init = prom_init1,
};
@@ -695,15 +694,15 @@ typedef struct RamDevice {
} RamDevice;
/* System RAM */
-static int ram_init1(SysBusDevice *dev)
+static void ram_realize(DeviceState *dev, Error **errp)
{
RamDevice *d = SUN4U_RAM(dev);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
memory_region_init_ram(&d->ram, OBJECT(d), "sun4u.ram", d->size,
&error_fatal);
vmstate_register_ram_global(&d->ram);
- sysbus_init_mmio(dev, &d->ram);
- return 0;
+ sysbus_init_mmio(sbd, &d->ram);
}
static void ram_init(hwaddr addr, ram_addr_t RAM_size)
@@ -731,9 +730,8 @@ static Property ram_properties[] = {
static void ram_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = ram_init1;
+ dc->realize = ram_realize;
dc->props = ram_properties;
}
--
2.9.3
- [Qemu-devel] [PATCH 0/9] QOM'ify work for sparc, xiaoqiang zhao, 2016/10/23
- [Qemu-devel] [PATCH 7/9] hw/timer: QOM'ify slavio_timer, xiaoqiang zhao, 2016/10/23
- [Qemu-devel] [PATCH 1/9] hw/misc: QOM'ify eccmemctl.c, xiaoqiang zhao, 2016/10/23
- [Qemu-devel] [PATCH 3/9] hw/dma: QOM'ify sun4m_iommu.c, xiaoqiang zhao, 2016/10/23
- [Qemu-devel] [PATCH 9/9] hw/sparc64: QOM'ify sun4u.c,
xiaoqiang zhao <=
- [Qemu-devel] [PATCH 4/9] hw/misc: QOM'ify slavio_misc.c, xiaoqiang zhao, 2016/10/23
- [Qemu-devel] [PATCH 5/9] hw/timer: QOM'ify m48txx_sysbus (pass 1), xiaoqiang zhao, 2016/10/23
- [Qemu-devel] [PATCH 8/9] hw/sparc: QOM'ify sun4m.c, xiaoqiang zhao, 2016/10/23
- [Qemu-devel] [PATCH 2/9] hw/dma: QOM'ify sparc32_dma.c, xiaoqiang zhao, 2016/10/23
- [Qemu-devel] [PATCH 6/9] hw/timer: QOM'ify m48txx_sysbus (pass 2), xiaoqiang zhao, 2016/10/23