Re: [Qemu-devel] [PATCHv3 06/13] sparc32_dma: use object link instead of qdev property to pass IOMMU reference

[Philippe Mathieu-Daudé]

On 10/14/2017 03:38 PM, Mark Cave-Ayland wrote:
> This enables us to remove the last remaining (opaque) qdev property. Whilst we
> are here, also update iommu_init() to use TYPE_SUN4M_IOMMU instead of a
> hardcoded string.
> 
> Signed-off-by: Mark Cave-Ayland <address@hidden>

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

> ---
>  hw/dma/sparc32_dma.c |   13 +++++--------
>  hw/sparc/sun4m.c     |    4 ++--
>  2 files changed, 7 insertions(+), 10 deletions(-)
> 
> diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c
> index ae8fa06..c56a2ba 100644
> --- a/hw/dma/sparc32_dma.c
> +++ b/hw/dma/sparc32_dma.c
> @@ -263,24 +263,21 @@ static void sparc32_dma_device_init(Object *obj)
>  
>      sysbus_init_mmio(sbd, &s->iomem);
>  
> +    object_property_add_link(OBJECT(dev), "iommu", TYPE_SUN4M_IOMMU,
> +                             (Object **) &s->iommu,
> +                             qdev_prop_allow_set_link_before_realize,
> +                             0, NULL);
> +
>      qdev_init_gpio_in(dev, dma_set_irq, 1);
>      qdev_init_gpio_out(dev, s->gpio, 2);
>  }
>  
> -static Property sparc32_dma_device_properties[] = {
> -    DEFINE_PROP_PTR("iommu_opaque", DMADeviceState, iommu),
> -    DEFINE_PROP_END_OF_LIST(),
> -};
> -
>  static void sparc32_dma_device_class_init(ObjectClass *klass, void *data)
>  {
>      DeviceClass *dc = DEVICE_CLASS(klass);
>  
>      dc->reset = sparc32_dma_device_reset;
>      dc->vmsd = &vmstate_sparc32_dma_device;
> -    dc->props = sparc32_dma_device_properties;
> -    /* Reason: pointer property "iommu_opaque" */
> -    dc->user_creatable = false;
>  }
>  
>  static const TypeInfo sparc32_dma_device_info = {
> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
> index 4f2ed4b..12d36b5 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -297,7 +297,7 @@ static void *iommu_init(hwaddr addr, uint32_t version, 
> qemu_irq irq)
>      DeviceState *dev;
>      SysBusDevice *s;
>  
> -    dev = qdev_create(NULL, "iommu");
> +    dev = qdev_create(NULL, TYPE_SUN4M_IOMMU);
>      qdev_prop_set_uint32(dev, "version", version);
>      qdev_init_nofail(dev);
>      s = SYS_BUS_DEVICE(dev);
> @@ -313,7 +313,7 @@ static void *sparc32_dma_init(hwaddr daddr, void *iommu, 
> int is_ledma)
>      SysBusDevice *s;
>  
>      dev = qdev_create(NULL, is_ledma ? "sparc32-ledma" : "sparc32-espdma");
> -    qdev_prop_set_ptr(dev, "iommu_opaque", iommu);
> +    object_property_set_link(OBJECT(dev), OBJECT(iommu), "iommu", 
> &error_abort);
>      qdev_init_nofail(dev);
>      s = SYS_BUS_DEVICE(dev);
>      sysbus_mmio_map(s, 0, daddr);
>