Re: [Qemu-devel] [PATCH v2 09/21] input/pl050: Convert sysbus init function to realize function

[Philippe Mathieu-Daudé]

On 23/11/18 16:30, Mao Zhongyi wrote:
> Use DeviceClass rather than SysBusDeviceClass in
> pl050_class_init().
> 
> Cc: peter.mayd...@linaro.org
> Cc: qemu-...@nongnu.org
> 
> Signed-off-by: Mao Zhongyi 
> Signed-off-by: Zhang Shengju 

Reviewed-by: Philippe Mathieu-Daudé 

> ---
>  hw/input/pl050.c | 11 +--
>  1 file changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/input/pl050.c b/hw/input/pl050.c
> index be9cd57b17..15bffbfcad 100644
> --- a/hw/input/pl050.c
> +++ b/hw/input/pl050.c
> @@ -139,19 +139,19 @@ static const MemoryRegionOps pl050_ops = {
>  .endianness = DEVICE_NATIVE_ENDIAN,
>  };
>  
> -static int pl050_initfn(SysBusDevice *dev)
> +static void pl050_realize(DeviceState *dev, Error **errp)
>  {
>  PL050State *s = PL050(dev);
> +SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
>  
>  memory_region_init_io(>iomem, OBJECT(s), _ops, s, "pl050", 
> 0x1000);
> -sysbus_init_mmio(dev, >iomem);
> -sysbus_init_irq(dev, >irq);
> +sysbus_init_mmio(sbd, >iomem);
> +sysbus_init_irq(sbd, >irq);
>  if (s->is_mouse) {
>  s->dev = ps2_mouse_init(pl050_update, s);
>  } else {
>  s->dev = ps2_kbd_init(pl050_update, s);
>  }
> -return 0;
>  }
>  
>  static void pl050_keyboard_init(Object *obj)
> @@ -183,9 +183,8 @@ static const TypeInfo pl050_mouse_info = {
>  static void pl050_class_init(ObjectClass *oc, void *data)
>  {
>  DeviceClass *dc = DEVICE_CLASS(oc);
> -SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(oc);
>  
> -sdc->init = pl050_initfn;
> +dc->realize = pl050_realize;
>  dc->vmsd = _pl050;
>  }
>  
> 

[Qemu-devel] [PATCH v2 09/21] input/pl050: Convert sysbus init function to realize function

[Mao Zhongyi]

Use DeviceClass rather than SysBusDeviceClass in
pl050_class_init().

Cc: peter.mayd...@linaro.org
Cc: qemu-...@nongnu.org

Signed-off-by: Mao Zhongyi 
Signed-off-by: Zhang Shengju 
---
 hw/input/pl050.c | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/hw/input/pl050.c b/hw/input/pl050.c
index be9cd57b17..15bffbfcad 100644
--- a/hw/input/pl050.c
+++ b/hw/input/pl050.c
@@ -139,19 +139,19 @@ static const MemoryRegionOps pl050_ops = {
 .endianness = DEVICE_NATIVE_ENDIAN,
 };
 
-static int pl050_initfn(SysBusDevice *dev)
+static void pl050_realize(DeviceState *dev, Error **errp)
 {
 PL050State *s = PL050(dev);
+SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
 
 memory_region_init_io(>iomem, OBJECT(s), _ops, s, "pl050", 
0x1000);
-sysbus_init_mmio(dev, >iomem);
-sysbus_init_irq(dev, >irq);
+sysbus_init_mmio(sbd, >iomem);
+sysbus_init_irq(sbd, >irq);
 if (s->is_mouse) {
 s->dev = ps2_mouse_init(pl050_update, s);
 } else {
 s->dev = ps2_kbd_init(pl050_update, s);
 }
-return 0;
 }
 
 static void pl050_keyboard_init(Object *obj)
@@ -183,9 +183,8 @@ static const TypeInfo pl050_mouse_info = {
 static void pl050_class_init(ObjectClass *oc, void *data)
 {
 DeviceClass *dc = DEVICE_CLASS(oc);
-SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(oc);
 
-sdc->init = pl050_initfn;
+dc->realize = pl050_realize;
 dc->vmsd = _pl050;
 }
 
-- 
2.17.1