diff mbox

[RESEND,4/9] hw/misc: QOM'ify slavio_misc.c

Message ID 20170205133727.23424-5-zxq_yx_007@163.com (mailing list archive)
State New, archived
Headers show

Commit Message

zhao xiao qiang Feb. 5, 2017, 1:37 p.m. UTC 
Drop the old SysBus init function and use instance_init

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
---
 hw/misc/slavio_misc.c | 43 +++++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

Comments

Philippe Mathieu-Daudé Feb. 23, 2017, 2:07 a.m. UTC | #1 
On 02/05/2017 10:37 AM, xiaoqiang zhao wrote:
> Drop the old SysBus init function and use instance_init
>
> Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  hw/misc/slavio_misc.c | 43 +++++++++++++++++--------------------------
>  1 file changed, 17 insertions(+), 26 deletions(-)
>
> diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c
> index edd5de0702..e1a706e828 100644
> --- a/hw/misc/slavio_misc.c
> +++ b/hw/misc/slavio_misc.c
> @@ -414,76 +414,73 @@ static const VMStateDescription vmstate_misc = {
>      }
>  };
>
> -static int apc_init1(SysBusDevice *dev)
> +static void apc_init(Object *obj)
>  {
> -    APCState *s = APC(dev);
> +    APCState *s = APC(obj);
> +    SysBusDevice *dev = SYS_BUS_DEVICE(obj);
>
>      sysbus_init_irq(dev, &s->cpu_halt);
>
>      /* Power management (APC) XXX: not a Slavio device */
> -    memory_region_init_io(&s->iomem, OBJECT(s), &apc_mem_ops, s,
> +    memory_region_init_io(&s->iomem, obj, &apc_mem_ops, s,
>                            "apc", MISC_SIZE);
>      sysbus_init_mmio(dev, &s->iomem);
> -    return 0;
>  }
>
> -static int slavio_misc_init1(SysBusDevice *sbd)
> +static void slavio_misc_init(Object *obj)
>  {
> -    DeviceState *dev = DEVICE(sbd);
> -    MiscState *s = SLAVIO_MISC(dev);
> +    DeviceState *dev = DEVICE(obj);
> +    MiscState *s = SLAVIO_MISC(obj);
> +    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
>
>      sysbus_init_irq(sbd, &s->irq);
>      sysbus_init_irq(sbd, &s->fdc_tc);
>
>      /* 8 bit registers */
>      /* Slavio control */
> -    memory_region_init_io(&s->cfg_iomem, OBJECT(s), &slavio_cfg_mem_ops, s,
> +    memory_region_init_io(&s->cfg_iomem, obj, &slavio_cfg_mem_ops, s,
>                            "configuration", MISC_SIZE);
>      sysbus_init_mmio(sbd, &s->cfg_iomem);
>
>      /* Diagnostics */
> -    memory_region_init_io(&s->diag_iomem, OBJECT(s), &slavio_diag_mem_ops, s,
> +    memory_region_init_io(&s->diag_iomem, obj, &slavio_diag_mem_ops, s,
>                            "diagnostic", MISC_SIZE);
>      sysbus_init_mmio(sbd, &s->diag_iomem);
>
>      /* Modem control */
> -    memory_region_init_io(&s->mdm_iomem, OBJECT(s), &slavio_mdm_mem_ops, s,
> +    memory_region_init_io(&s->mdm_iomem, obj, &slavio_mdm_mem_ops, s,
>                            "modem", MISC_SIZE);
>      sysbus_init_mmio(sbd, &s->mdm_iomem);
>
>      /* 16 bit registers */
>      /* ss600mp diag LEDs */
> -    memory_region_init_io(&s->led_iomem, OBJECT(s), &slavio_led_mem_ops, s,
> +    memory_region_init_io(&s->led_iomem, obj, &slavio_led_mem_ops, s,
>                            "leds", LED_SIZE);
>      sysbus_init_mmio(sbd, &s->led_iomem);
>
>      /* 32 bit registers */
>      /* System control */
> -    memory_region_init_io(&s->sysctrl_iomem, OBJECT(s), &slavio_sysctrl_mem_ops, s,
> +    memory_region_init_io(&s->sysctrl_iomem, obj, &slavio_sysctrl_mem_ops, s,
>                            "system-control", SYSCTRL_SIZE);
>      sysbus_init_mmio(sbd, &s->sysctrl_iomem);
>
>      /* AUX 1 (Misc System Functions) */
> -    memory_region_init_io(&s->aux1_iomem, OBJECT(s), &slavio_aux1_mem_ops, s,
> +    memory_region_init_io(&s->aux1_iomem, obj, &slavio_aux1_mem_ops, s,
>                            "misc-system-functions", MISC_SIZE);
>      sysbus_init_mmio(sbd, &s->aux1_iomem);
>
>      /* AUX 2 (Software Powerdown Control) */
> -    memory_region_init_io(&s->aux2_iomem, OBJECT(s), &slavio_aux2_mem_ops, s,
> +    memory_region_init_io(&s->aux2_iomem, obj, &slavio_aux2_mem_ops, s,
>                            "software-powerdown-control", MISC_SIZE);
>      sysbus_init_mmio(sbd, &s->aux2_iomem);
>
>      qdev_init_gpio_in(dev, slavio_set_power_fail, 1);
> -
> -    return 0;
>  }
>
>  static void slavio_misc_class_init(ObjectClass *klass, void *data)
>  {
>      DeviceClass *dc = DEVICE_CLASS(klass);
> -    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
>
> -    k->init = slavio_misc_init1;
>      dc->reset = slavio_misc_reset;
>      dc->vmsd = &vmstate_misc;
>  }
> @@ -492,21 +489,15 @@ static const TypeInfo slavio_misc_info = {
>      .name          = TYPE_SLAVIO_MISC,
>      .parent        = TYPE_SYS_BUS_DEVICE,
>      .instance_size = sizeof(MiscState),
> +    .instance_init = slavio_misc_init,
>      .class_init    = slavio_misc_class_init,
>  };
>
> -static void apc_class_init(ObjectClass *klass, void *data)
> -{
> -    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
> -
> -    k->init = apc_init1;
> -}
> -
>  static const TypeInfo apc_info = {
>      .name          = TYPE_APC,
>      .parent        = TYPE_SYS_BUS_DEVICE,
>      .instance_size = sizeof(MiscState),
> -    .class_init    = apc_class_init,
> +    .instance_init = apc_init,
>  };
>
>  static void slavio_misc_register_types(void)
>
diff mbox

Patch

diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c
index edd5de0702..e1a706e828 100644
--- a/hw/misc/slavio_misc.c
+++ b/hw/misc/slavio_misc.c
@@ -414,76 +414,73 @@  static const VMStateDescription vmstate_misc = {
     }
 };
 
-static int apc_init1(SysBusDevice *dev)
+static void apc_init(Object *obj)
 {
-    APCState *s = APC(dev);
+    APCState *s = APC(obj);
+    SysBusDevice *dev = SYS_BUS_DEVICE(obj);
 
     sysbus_init_irq(dev, &s->cpu_halt);
 
     /* Power management (APC) XXX: not a Slavio device */
-    memory_region_init_io(&s->iomem, OBJECT(s), &apc_mem_ops, s,
+    memory_region_init_io(&s->iomem, obj, &apc_mem_ops, s,
                           "apc", MISC_SIZE);
     sysbus_init_mmio(dev, &s->iomem);
-    return 0;
 }
 
-static int slavio_misc_init1(SysBusDevice *sbd)
+static void slavio_misc_init(Object *obj)
 {
-    DeviceState *dev = DEVICE(sbd);
-    MiscState *s = SLAVIO_MISC(dev);
+    DeviceState *dev = DEVICE(obj);
+    MiscState *s = SLAVIO_MISC(obj);
+    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
 
     sysbus_init_irq(sbd, &s->irq);
     sysbus_init_irq(sbd, &s->fdc_tc);
 
     /* 8 bit registers */
     /* Slavio control */
-    memory_region_init_io(&s->cfg_iomem, OBJECT(s), &slavio_cfg_mem_ops, s,
+    memory_region_init_io(&s->cfg_iomem, obj, &slavio_cfg_mem_ops, s,
                           "configuration", MISC_SIZE);
     sysbus_init_mmio(sbd, &s->cfg_iomem);
 
     /* Diagnostics */
-    memory_region_init_io(&s->diag_iomem, OBJECT(s), &slavio_diag_mem_ops, s,
+    memory_region_init_io(&s->diag_iomem, obj, &slavio_diag_mem_ops, s,
                           "diagnostic", MISC_SIZE);
     sysbus_init_mmio(sbd, &s->diag_iomem);
 
     /* Modem control */
-    memory_region_init_io(&s->mdm_iomem, OBJECT(s), &slavio_mdm_mem_ops, s,
+    memory_region_init_io(&s->mdm_iomem, obj, &slavio_mdm_mem_ops, s,
                           "modem", MISC_SIZE);
     sysbus_init_mmio(sbd, &s->mdm_iomem);
 
     /* 16 bit registers */
     /* ss600mp diag LEDs */
-    memory_region_init_io(&s->led_iomem, OBJECT(s), &slavio_led_mem_ops, s,
+    memory_region_init_io(&s->led_iomem, obj, &slavio_led_mem_ops, s,
                           "leds", LED_SIZE);
     sysbus_init_mmio(sbd, &s->led_iomem);
 
     /* 32 bit registers */
     /* System control */
-    memory_region_init_io(&s->sysctrl_iomem, OBJECT(s), &slavio_sysctrl_mem_ops, s,
+    memory_region_init_io(&s->sysctrl_iomem, obj, &slavio_sysctrl_mem_ops, s,
                           "system-control", SYSCTRL_SIZE);
     sysbus_init_mmio(sbd, &s->sysctrl_iomem);
 
     /* AUX 1 (Misc System Functions) */
-    memory_region_init_io(&s->aux1_iomem, OBJECT(s), &slavio_aux1_mem_ops, s,
+    memory_region_init_io(&s->aux1_iomem, obj, &slavio_aux1_mem_ops, s,
                           "misc-system-functions", MISC_SIZE);
     sysbus_init_mmio(sbd, &s->aux1_iomem);
 
     /* AUX 2 (Software Powerdown Control) */
-    memory_region_init_io(&s->aux2_iomem, OBJECT(s), &slavio_aux2_mem_ops, s,
+    memory_region_init_io(&s->aux2_iomem, obj, &slavio_aux2_mem_ops, s,
                           "software-powerdown-control", MISC_SIZE);
     sysbus_init_mmio(sbd, &s->aux2_iomem);
 
     qdev_init_gpio_in(dev, slavio_set_power_fail, 1);
-
-    return 0;
 }
 
 static void slavio_misc_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
-    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
 
-    k->init = slavio_misc_init1;
     dc->reset = slavio_misc_reset;
     dc->vmsd = &vmstate_misc;
 }
@@ -492,21 +489,15 @@  static const TypeInfo slavio_misc_info = {
     .name          = TYPE_SLAVIO_MISC,
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(MiscState),
+    .instance_init = slavio_misc_init,
     .class_init    = slavio_misc_class_init,
 };
 
-static void apc_class_init(ObjectClass *klass, void *data)
-{
-    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
-
-    k->init = apc_init1;
-}
-
 static const TypeInfo apc_info = {
     .name          = TYPE_APC,
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(MiscState),
-    .class_init    = apc_class_init,
+    .instance_init = apc_init,
 };
 
 static void slavio_misc_register_types(void)