[v2,2/5] musicpal: qdevify musicpal-misc

Make musicpal-misc into its own (trivial) qdev device, so we
can get rid of the abuse of sysbus_add_memory().

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/musicpal.c |   28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

On Tue, Feb 26, 2013 at 3:08 AM, Peter Maydell <peter.maydell@linaro.org> wrote:
> Make musicpal-misc into its own (trivial) qdev device, so we
> can get rid of the abuse of sysbus_add_memory().
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

> ---
>  hw/musicpal.c |   28 +++++++++++++++++++++++-----
>  1 file changed, 23 insertions(+), 5 deletions(-)
>
> diff --git a/hw/musicpal.c b/hw/musicpal.c
> index 272cb80..042b7f1 100644
> --- a/hw/musicpal.c
> +++ b/hw/musicpal.c
> @@ -1031,6 +1031,15 @@ static const TypeInfo mv88w8618_flashcfg_info = {
>
>  #define MP_BOARD_REVISION       0x31
>
> +typedef struct {
> +    SysBusDevice busdev;
> +    MemoryRegion iomem;
> +} MusicPalMiscState;
> +
> +#define TYPE_MUSICPAL_MISC "musicpal-misc"
> +#define MUSICPAL_MISC(obj) \
> +     OBJECT_CHECK(MusicPalMiscState, (obj), TYPE_MUSICPAL_MISC)
> +
>  static uint64_t musicpal_misc_read(void *opaque, hwaddr offset,
>                                     unsigned size)
>  {
> @@ -1054,15 +1063,23 @@ static const MemoryRegionOps musicpal_misc_ops = {
>      .endianness = DEVICE_NATIVE_ENDIAN,
>  };
>
> -static void musicpal_misc_init(SysBusDevice *dev)
> +static void musicpal_misc_init(Object *obj)
>  {
> -    MemoryRegion *iomem = g_new(MemoryRegion, 1);
> +    SysBusDevice *sd = SYS_BUS_DEVICE(obj);
> +    MusicPalMiscState *s = MUSICPAL_MISC(obj);
>
> -    memory_region_init_io(iomem, &musicpal_misc_ops, NULL,
> +    memory_region_init_io(&s->iomem, &musicpal_misc_ops, NULL,
>                            "musicpal-misc", MP_MISC_SIZE);
> -    sysbus_add_memory(dev, MP_MISC_BASE, iomem);
> +    sysbus_init_mmio(sd, &s->iomem);
>  }
>
> +static const TypeInfo musicpal_misc_info = {
> +    .name = TYPE_MUSICPAL_MISC,
> +    .parent = TYPE_SYS_BUS_DEVICE,
> +    .instance_init = musicpal_misc_init,
> +    .instance_size = sizeof(MusicPalMiscState),
> +};
> +
>  /* WLAN register offsets */
>  #define MP_WLAN_MAGIC1          0x11c
>  #define MP_WLAN_MAGIC2          0x124
> @@ -1612,7 +1629,7 @@ static void musicpal_init(QEMUMachineInitArgs *args)
>
>      sysbus_create_simple("mv88w8618_wlan", MP_WLAN_BASE, NULL);
>
> -    musicpal_misc_init(SYS_BUS_DEVICE(dev));
> +    sysbus_create_simple(TYPE_MUSICPAL_MISC, MP_MISC_BASE, NULL);
>
>      dev = sysbus_create_simple("musicpal_gpio", MP_GPIO_BASE, pic[MP_GPIO_IRQ]);
>      i2c_dev = sysbus_create_simple("gpio_i2c", -1, NULL);
> @@ -1692,6 +1709,7 @@ static void musicpal_register_types(void)
>      type_register_static(&musicpal_lcd_info);
>      type_register_static(&musicpal_gpio_info);
>      type_register_static(&musicpal_key_info);
> +    type_register_static(&musicpal_misc_info);
>  }
>
>  type_init(musicpal_register_types)
> --
> 1.7.9.5
>
>

Am 25.02.2013 18:08, schrieb Peter Maydell:
> Make musicpal-misc into its own (trivial) qdev device, so we
> can get rid of the abuse of sysbus_add_memory().
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  hw/musicpal.c |   28 +++++++++++++++++++++++-----
>  1 file changed, 23 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/musicpal.c b/hw/musicpal.c
> index 272cb80..042b7f1 100644
> --- a/hw/musicpal.c
> +++ b/hw/musicpal.c
> @@ -1031,6 +1031,15 @@ static const TypeInfo mv88w8618_flashcfg_info = {
>  
>  #define MP_BOARD_REVISION       0x31
>  
> +typedef struct {
> +    SysBusDevice busdev;

I believe I asked for this field to be named parent_obj, is there a
compatibility reason (macro?) to keep the old-style naming?

Otherwise looks good.

Andreas

> +    MemoryRegion iomem;
> +} MusicPalMiscState;
> +
> +#define TYPE_MUSICPAL_MISC "musicpal-misc"
> +#define MUSICPAL_MISC(obj) \
> +     OBJECT_CHECK(MusicPalMiscState, (obj), TYPE_MUSICPAL_MISC)
> +
>  static uint64_t musicpal_misc_read(void *opaque, hwaddr offset,
>                                     unsigned size)
>  {
> @@ -1054,15 +1063,23 @@ static const MemoryRegionOps musicpal_misc_ops = {
>      .endianness = DEVICE_NATIVE_ENDIAN,
>  };
>  
> -static void musicpal_misc_init(SysBusDevice *dev)
> +static void musicpal_misc_init(Object *obj)
>  {
> -    MemoryRegion *iomem = g_new(MemoryRegion, 1);
> +    SysBusDevice *sd = SYS_BUS_DEVICE(obj);
> +    MusicPalMiscState *s = MUSICPAL_MISC(obj);
>  
> -    memory_region_init_io(iomem, &musicpal_misc_ops, NULL,
> +    memory_region_init_io(&s->iomem, &musicpal_misc_ops, NULL,
>                            "musicpal-misc", MP_MISC_SIZE);
> -    sysbus_add_memory(dev, MP_MISC_BASE, iomem);
> +    sysbus_init_mmio(sd, &s->iomem);
>  }
>  
> +static const TypeInfo musicpal_misc_info = {
> +    .name = TYPE_MUSICPAL_MISC,
> +    .parent = TYPE_SYS_BUS_DEVICE,
> +    .instance_init = musicpal_misc_init,
> +    .instance_size = sizeof(MusicPalMiscState),
> +};
> +
>  /* WLAN register offsets */
>  #define MP_WLAN_MAGIC1          0x11c
>  #define MP_WLAN_MAGIC2          0x124
> @@ -1612,7 +1629,7 @@ static void musicpal_init(QEMUMachineInitArgs *args)
>  
>      sysbus_create_simple("mv88w8618_wlan", MP_WLAN_BASE, NULL);
>  
> -    musicpal_misc_init(SYS_BUS_DEVICE(dev));
> +    sysbus_create_simple(TYPE_MUSICPAL_MISC, MP_MISC_BASE, NULL);
>  
>      dev = sysbus_create_simple("musicpal_gpio", MP_GPIO_BASE, pic[MP_GPIO_IRQ]);
>      i2c_dev = sysbus_create_simple("gpio_i2c", -1, NULL);
> @@ -1692,6 +1709,7 @@ static void musicpal_register_types(void)
>      type_register_static(&musicpal_lcd_info);
>      type_register_static(&musicpal_gpio_info);
>      type_register_static(&musicpal_key_info);
> +    type_register_static(&musicpal_misc_info);
>  }
>  
>  type_init(musicpal_register_types)
>

On 4 March 2013 19:22, Andreas Färber <afaerber@suse.de> wrote:
> Am 25.02.2013 18:08, schrieb Peter Maydell:
>> --- a/hw/musicpal.c
>> +++ b/hw/musicpal.c
>> @@ -1031,6 +1031,15 @@ static const TypeInfo mv88w8618_flashcfg_info = {
>>
>>  #define MP_BOARD_REVISION       0x31
>>
>> +typedef struct {
>> +    SysBusDevice busdev;
>
> I believe I asked for this field to be named parent_obj, is there a
> compatibility reason (macro?) to keep the old-style naming?

Apologies, you did but I missed the request when I was going back
through the mail thread for review comments on this patch. Will fix.

-- PMM