Re: [Qemu-devel] [PATCH v2 8/9] hw/sparc: QOM'ify sun4m.c

2017-04-29 Thread Philippe Mathieu-Daudé 

On 04/29/2017 07:49 AM, xiaoqiang zhao wrote:

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

Signed-off-by: xiaoqiang zhao 


Reviewed-by: Philippe Mathieu-Daudé 


---
 hw/sparc/sun4m.c | 54 +++---
 1 file changed, 19 insertions(+), 35 deletions(-)

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 5f022cc08d..0faff4619f 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -585,30 +585,23 @@ typedef struct IDRegState {
 MemoryRegion mem;
 } IDRegState;

-static int idreg_init1(SysBusDevice *dev)
+static void idreg_init1(Object *obj)
 {
-IDRegState *s = MACIO_ID_REGISTER(dev);
+IDRegState *s = MACIO_ID_REGISTER(obj);
+SysBusDevice *dev = SYS_BUS_DEVICE(obj);

-memory_region_init_ram(>mem, OBJECT(s),
+memory_region_init_ram(>mem, obj,
"sun4m.idreg", sizeof(idreg_data), _fatal);
 vmstate_register_ram_global(>mem);
 memory_region_set_readonly(>mem, true);
 sysbus_init_mmio(dev, >mem);
-return 0;
-}
-
-static void idreg_class_init(ObjectClass *klass, void *data)
-{
-SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
-
-k->init = idreg_init1;
 }

 static const TypeInfo idreg_info = {
 .name  = TYPE_MACIO_ID_REGISTER,
 .parent= TYPE_SYS_BUS_DEVICE,
 .instance_size = sizeof(IDRegState),
-.class_init= idreg_class_init,
+.instance_init = idreg_init1,
 };

 #define TYPE_TCX_AFX "tcx_afx"
@@ -633,28 +626,21 @@ static void afx_init(hwaddr addr)
 sysbus_mmio_map(s, 0, addr);
 }

-static int afx_init1(SysBusDevice *dev)
+static void afx_init1(Object *obj)
 {
-AFXState *s = TCX_AFX(dev);
+AFXState *s = TCX_AFX(obj);
+SysBusDevice *dev = SYS_BUS_DEVICE(obj);

-memory_region_init_ram(>mem, OBJECT(s), "sun4m.afx", 4, _fatal);
+memory_region_init_ram(>mem, obj, "sun4m.afx", 4, _fatal);
 vmstate_register_ram_global(>mem);
 sysbus_init_mmio(dev, >mem);
-return 0;
-}
-
-static void afx_class_init(ObjectClass *klass, void *data)
-{
-SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
-
-k->init = afx_init1;
 }

 static const TypeInfo afx_info = {
 .name  = TYPE_TCX_AFX,
 .parent= TYPE_SYS_BUS_DEVICE,
 .instance_size = sizeof(AFXState),
-.class_init= afx_class_init,
+.instance_init = afx_init1,
 };

 #define TYPE_OPENPROM "openprom"
@@ -707,16 +693,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(>prom, OBJECT(s), "sun4m.prom", PROM_SIZE_MAX,
+memory_region_init_ram(>prom, obj, "sun4m.prom", PROM_SIZE_MAX,
_fatal);
 vmstate_register_ram_global(>prom);
 memory_region_set_readonly(>prom, true);
 sysbus_init_mmio(dev, >prom);
-return 0;
 }

 static Property prom_properties[] = {
@@ -726,9 +712,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;
 }

@@ -737,6 +721,7 @@ static const TypeInfo prom_info = {
 .parent= TYPE_SYS_BUS_DEVICE,
 .instance_size = sizeof(PROMState),
 .class_init= prom_class_init,
+.instance_init = prom_init1,
 };

 #define TYPE_SUN4M_MEMORY "memory"
@@ -750,14 +735,14 @@ typedef struct RamDevice {
 } RamDevice;

 /* System RAM */
-static int ram_init1(SysBusDevice *dev)
+static void ram_realize(DeviceState *dev, Error **errp)
 {
 RamDevice *d = SUN4M_RAM(dev);
+SysBusDevice *sbd = SYS_BUS_DEVICE(dev);

 memory_region_allocate_system_memory(>ram, OBJECT(d), "sun4m.ram",
  d->size);
-sysbus_init_mmio(dev, >ram);
-return 0;
+sysbus_init_mmio(sbd, >ram);
 }

 static void ram_init(hwaddr addr, ram_addr_t RAM_size,
@@ -793,9 +778,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;
 }

[Qemu-devel] [PATCH v2 8/9] hw/sparc: QOM'ify sun4m.c

2017-04-29 Thread xiaoqiang zhao 
Drop the old SysBusDeviceClass::init and use instance_init
or DeviceClass::realize instead

Signed-off-by: xiaoqiang zhao 
---
 hw/sparc/sun4m.c | 54 +++---
 1 file changed, 19 insertions(+), 35 deletions(-)

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 5f022cc08d..0faff4619f 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -585,30 +585,23 @@ typedef struct IDRegState {
 MemoryRegion mem;
 } IDRegState;
 
-static int idreg_init1(SysBusDevice *dev)
+static void idreg_init1(Object *obj)
 {
-IDRegState *s = MACIO_ID_REGISTER(dev);
+IDRegState *s = MACIO_ID_REGISTER(obj);
+SysBusDevice *dev = SYS_BUS_DEVICE(obj);
 
-memory_region_init_ram(>mem, OBJECT(s),
+memory_region_init_ram(>mem, obj,
"sun4m.idreg", sizeof(idreg_data), _fatal);
 vmstate_register_ram_global(>mem);
 memory_region_set_readonly(>mem, true);
 sysbus_init_mmio(dev, >mem);
-return 0;
-}
-
-static void idreg_class_init(ObjectClass *klass, void *data)
-{
-SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
-
-k->init = idreg_init1;
 }
 
 static const TypeInfo idreg_info = {
 .name  = TYPE_MACIO_ID_REGISTER,
 .parent= TYPE_SYS_BUS_DEVICE,
 .instance_size = sizeof(IDRegState),
-.class_init= idreg_class_init,
+.instance_init = idreg_init1,
 };
 
 #define TYPE_TCX_AFX "tcx_afx"
@@ -633,28 +626,21 @@ static void afx_init(hwaddr addr)
 sysbus_mmio_map(s, 0, addr);
 }
 
-static int afx_init1(SysBusDevice *dev)
+static void afx_init1(Object *obj)
 {
-AFXState *s = TCX_AFX(dev);
+AFXState *s = TCX_AFX(obj);
+SysBusDevice *dev = SYS_BUS_DEVICE(obj);
 
-memory_region_init_ram(>mem, OBJECT(s), "sun4m.afx", 4, _fatal);
+memory_region_init_ram(>mem, obj, "sun4m.afx", 4, _fatal);
 vmstate_register_ram_global(>mem);
 sysbus_init_mmio(dev, >mem);
-return 0;
-}
-
-static void afx_class_init(ObjectClass *klass, void *data)
-{
-SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
-
-k->init = afx_init1;
 }
 
 static const TypeInfo afx_info = {
 .name  = TYPE_TCX_AFX,
 .parent= TYPE_SYS_BUS_DEVICE,
 .instance_size = sizeof(AFXState),
-.class_init= afx_class_init,
+.instance_init = afx_init1,
 };
 
 #define TYPE_OPENPROM "openprom"
@@ -707,16 +693,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(>prom, OBJECT(s), "sun4m.prom", PROM_SIZE_MAX,
+memory_region_init_ram(>prom, obj, "sun4m.prom", PROM_SIZE_MAX,
_fatal);
 vmstate_register_ram_global(>prom);
 memory_region_set_readonly(>prom, true);
 sysbus_init_mmio(dev, >prom);
-return 0;
 }
 
 static Property prom_properties[] = {
@@ -726,9 +712,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;
 }
 
@@ -737,6 +721,7 @@ static const TypeInfo prom_info = {
 .parent= TYPE_SYS_BUS_DEVICE,
 .instance_size = sizeof(PROMState),
 .class_init= prom_class_init,
+.instance_init = prom_init1,
 };
 
 #define TYPE_SUN4M_MEMORY "memory"
@@ -750,14 +735,14 @@ typedef struct RamDevice {
 } RamDevice;
 
 /* System RAM */
-static int ram_init1(SysBusDevice *dev)
+static void ram_realize(DeviceState *dev, Error **errp)
 {
 RamDevice *d = SUN4M_RAM(dev);
+SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
 
 memory_region_allocate_system_memory(>ram, OBJECT(d), "sun4m.ram",
  d->size);
-sysbus_init_mmio(dev, >ram);
-return 0;
+sysbus_init_mmio(sbd, >ram);
 }
 
 static void ram_init(hwaddr addr, ram_addr_t RAM_size,
@@ -793,9 +778,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.11.0