On 02/27/2017 01:37 PM, Igor Mammedov wrote:
> On Sun, 26 Feb 2017 17:48:15 +0100
> Marek Vasut <[email protected]> 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 <[email protected]>
>> Cc: Alexander Graf <[email protected]>
>> Cc: Chris Wulff <[email protected]>
>> Cc: Jeff Da Silva <[email protected]>
>> Cc: Ley Foon Tan <[email protected]>
>> Cc: Markus Armbruster <[email protected]>
>> Cc: Richard Henderson <[email protected]>
>> Cc: Sandra Loosemore <[email protected]>
>> Cc: Yves Vandervennet <[email protected]>
>> ---
>> hw/intc/nios2_iic.c | 13 ++++---------
>> hw/nios2/10m50_devboard.c | 3 ++-
>> 2 files changed, 6 insertions(+), 10 deletions(-)
>>
>> diff --git a/hw/intc/nios2_iic.c b/hw/intc/nios2_iic.c
>> index 818ab1b315..70550ef8c1 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,9 +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" */
>
>> - dc->cannot_instantiate_with_device_add_yet = true;
> this device is still not device_add creatable
> since object_property_add_const_link() is basically the same
> as DEFINE_PROP_PTR("cpu", AlteraIIC, cpu), so drop this hunk.
>
> otherwise patch is still improvement as it removes an instance
> of obsoleted DEFINE_PROP_PTR
Got it, 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++) {
>
--
Best regards,
Marek Vasut
