Re: [Qemu-arm] [Qemu-devel] [PATCH 01/22] musicpal: Convert sysbus init function to realize function

[Philippe Mathieu-Daudé]

On 19/11/18 13:07, Mao Zhongyi wrote:
> Use DeviceClass rather than SysBusDeviceClass in
> mv88w8618_wlan_class_init().
>
> Cc: address@hidden
> Cc: address@hidden
> Cc: address@hidden
>
> Signed-off-by: Mao Zhongyi <address@hidden>
> Signed-off-by: Zhang Shengju <address@hidden>

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

> ---
>   hw/arm/musicpal.c | 9 ++++-----
>   1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
> index 9648b3af44..7ffcdbb097 100644
> --- a/hw/arm/musicpal.c
> +++ b/hw/arm/musicpal.c
> @@ -1147,14 +1147,13 @@ static const MemoryRegionOps mv88w8618_wlan_ops = {
>       .endianness = DEVICE_NATIVE_ENDIAN,
>   };
>   
> -static int mv88w8618_wlan_init(SysBusDevice *dev)
> +static void mv88w8618_wlan_realize(DeviceState *dev, Error **errp)
>   {
>       MemoryRegion *iomem = g_new(MemoryRegion, 1);
>   
>       memory_region_init_io(iomem, OBJECT(dev), &mv88w8618_wlan_ops, NULL,
>                             "musicpal-wlan", MP_WLAN_SIZE);
> -    sysbus_init_mmio(dev, iomem);
> -    return 0;
> +    sysbus_init_mmio(SYS_BUS_DEVICE(dev), iomem);
>   }
>   
>   /* GPIO register offsets */
> @@ -1720,9 +1719,9 @@ DEFINE_MACHINE("musicpal", musicpal_machine_init)
>   
>   static void mv88w8618_wlan_class_init(ObjectClass *klass, void *data)
>   {
> -    SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
> +    DeviceClass *dc = DEVICE_CLASS(klass);
>   
> -    sdc->init = mv88w8618_wlan_init;
> +    dc->realize = mv88w8618_wlan_realize;
>   }
>   
>   static const TypeInfo mv88w8618_wlan_info = {