Re: [Qemu-devel] [PATCH qom-next for-1.6 7/8] pl110: QOM'ify pl110, pl110_versatile and pl111

[Hu Tao <hutao@cn.fujitsu.com>]

On Thu, Jul 25, 2013 at 01:16:51AM +0200, Andreas Färber wrote:
> Let pl110_versatile and pl111 inherit from pl110 and use PL110() cast;
> set their version index in an instance_init.
> 
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  hw/display/pl110.c | 71 ++++++++++++++++++++++--------------------------------
>  1 file changed, 29 insertions(+), 42 deletions(-)
> 
  
<...>

> -static int pl110_init(SysBusDevice *dev)
> +static int pl110_init(SysBusDevice *sbd)
>  {
> -    PL110State *s = FROM_SYSBUS(PL110State, dev);
> +    DeviceState *dev = DEVICE(sbd);
> +    PL110State *s = PL110(dev);
>  
>      memory_region_init_io(&s->iomem, OBJECT(s), &pl110_ops, s, "pl110", 0x1000);
> -    sysbus_init_mmio(dev, &s->iomem);
> -    sysbus_init_irq(dev, &s->irq);
> -    qdev_init_gpio_in(&s->busdev.qdev, pl110_mux_ctrl_set, 1);
> -    s->con = graphic_console_init(DEVICE(dev), &pl110_gfx_ops, s);
> +    sysbus_init_mmio(sbd, &s->iomem);
> +    sysbus_init_irq(sbd, &s->irq);
> +    qdev_init_gpio_in(dev, pl110_mux_ctrl_set, 1);
> +    s->con = graphic_console_init(dev, &pl110_gfx_ops, s);
>      return 0;

Would it be better to explicitly set PL110 version? I know PL110 is 0,
but it's not like a normal variable which is always good to be
initialized to 0, assuming a version number is bad. (This is not a problem
of this patch)

>  }
>  
> -static int pl110_versatile_init(SysBusDevice *dev)
> +static void pl110_versatile_init(Object *obj)
>  {
> -    PL110State *s = FROM_SYSBUS(PL110State, dev);
> +    PL110State *s = PL110(obj);
> +
>      s->version = PL110_VERSATILE;
> -    return pl110_init(dev);
>  }