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

[Philippe Mathieu-Daudé]

On 02/05/2017 10:37 AM, xiaoqiang zhao wrote:
> Drop the old SysBusDeviceClass::init and use instance_init
> or DeviceClass::realize instead
>
> Signed-off-by: xiaoqiang zhao <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>  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 f5b6efddf8..352ca0bb4c 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -584,30 +584,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(&s->mem, OBJECT(s),
> +    memory_region_init_ram(&s->mem, obj,
>                             "sun4m.idreg", sizeof(idreg_data), &error_fatal);
>      vmstate_register_ram_global(&s->mem);
>      memory_region_set_readonly(&s->mem, true);
>      sysbus_init_mmio(dev, &s->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"
> @@ -632,28 +625,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(&s->mem, OBJECT(s), "sun4m.afx", 4, &error_fatal);
> +    memory_region_init_ram(&s->mem, obj, "sun4m.afx", 4, &error_fatal);
>      vmstate_register_ram_global(&s->mem);
>      sysbus_init_mmio(dev, &s->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"
> @@ -706,16 +692,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), "sun4m.prom", PROM_SIZE_MAX,
> +    memory_region_init_ram(&s->prom, obj, "sun4m.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[] = {
> @@ -725,9 +711,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;
>  }
>
> @@ -736,6 +720,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"
> @@ -749,14 +734,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(&d->ram, OBJECT(d), "sun4m.ram",
>                                           d->size);
> -    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,
> @@ -792,9 +777,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;
>  }