Re: [Qemu-devel] [PATCH V2] nios2: iic: Convert CPU prop to qom link

[Marek Vasut]

On 03/17/2017 05:51 PM, Peter Maydell wrote:
> On 27 February 2017 at 19:38, Marek Vasut <address@hidden> wrote:
>> Add a const qom link between the CPU and the IIC instead
>> of passing the CPU link through a qom property.
>>
>> Signed-off-by: Marek Vasut <address@hidden>
>> Cc: Alexander Graf <address@hidden>
>> Cc: Chris Wulff <address@hidden>
>> Cc: Igor Mammedov <address@hidden>
>> Cc: Jeff Da Silva <address@hidden>
>> Cc: Ley Foon Tan <address@hidden>
>> Cc: Markus Armbruster <address@hidden>
>> Cc: Richard Henderson <address@hidden>
>> Cc: Sandra Loosemore <address@hidden>
>> Cc: Yves Vandervennet <address@hidden>
>> ---
>> V2: Retain dc->cannot_instantiate_with_device_add_yet = true
>>     in altera_iic_class_init() since the device is still not
>>     device_add() creatable.
>> ---
>>  hw/intc/nios2_iic.c       | 12 ++++--------
>>  hw/nios2/10m50_devboard.c |  3 ++-
>>  2 files changed, 6 insertions(+), 9 deletions(-)
>>
>> diff --git a/hw/intc/nios2_iic.c b/hw/intc/nios2_iic.c
>> index 818ab1b315..fe15621202 100644
>> --- a/hw/intc/nios2_iic.c
>> +++ b/hw/intc/nios2_iic.c
>> @@ -62,17 +62,15 @@ static void altera_iic_init(Object *obj)
>>      sysbus_init_irq(SYS_BUS_DEVICE(obj), &pv->parent_irq);
>>  }
>>
>> -static Property altera_iic_properties[] = {
>> -    DEFINE_PROP_PTR("cpu", AlteraIIC, cpu),
>> -    DEFINE_PROP_END_OF_LIST(),
>> -};
>> -
>>  static void altera_iic_realize(DeviceState *dev, Error **errp)
>>  {
>>      struct AlteraIIC *pv = ALTERA_IIC(dev);
>> +    Error *err = NULL;
>>
>> +    pv->cpu = object_property_get_link(OBJECT(dev), "cpu", &err);
>>      if (!pv->cpu) {
>> -        error_setg(errp, "altera,iic: CPU not connected");
>> +        error_setg(errp, "altera,iic: CPU link not found: %s",
>> +                   error_get_pretty(err));
>>          return;
>>      }
>>  }
>> @@ -81,8 +79,6 @@ static void altera_iic_class_init(ObjectClass *klass, void 
>> *data)
>>  {
>>      DeviceClass *dc = DEVICE_CLASS(klass);
>>
>> -    dc->props = altera_iic_properties;
>> -    /* Reason: pointer property "cpu" */
> 
> This comment goes with the line below it:
> 
>>      dc->cannot_instantiate_with_device_add_yet = true;
> 
> as it's explaining why we cannot instantiate with device add.
> 
> Either the cannot_instantiate assignment should go,
> or the comment needs to be updated to explain why we
> cannot-instantiate (since it's no longer because of a
> pointer property).

Fixed, will send V3 shortly, thanks.

>>      dc->realize = altera_iic_realize;
>>  }
>> diff --git a/hw/nios2/10m50_devboard.c b/hw/nios2/10m50_devboard.c
>> index 0d8b9aa58f..c18e0b2a17 100644
>> --- a/hw/nios2/10m50_devboard.c
>> +++ b/hw/nios2/10m50_devboard.c
>> @@ -83,7 +83,8 @@ static void nios2_10m50_ghrd_init(MachineState *machine)
>>
>>      /* Register: Internal Interrupt Controller (IIC) */
>>      dev = qdev_create(NULL, "altera,iic");
>> -    qdev_prop_set_ptr(dev, "cpu", cpu);
>> +    object_property_add_const_link(OBJECT(dev), "cpu", OBJECT(cpu),
>> +                                   &error_abort);
>>      qdev_init_nofail(dev);
>>      sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, cpu_irq[0]);
>>      for (i = 0; i < 32; i++) {
>> --
>> 2.11.0
> 
> thanks
> -- PMM
> 


-- 
Best regards,
Marek Vasut