From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coz5q-0005Rq-Vk for qemu-devel@nongnu.org; Fri, 17 Mar 2017 17:07:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coz5n-0007Yd-56 for qemu-devel@nongnu.org; Fri, 17 Mar 2017 17:07:26 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:60228) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1coz5m-0007YX-RD for qemu-devel@nongnu.org; Fri, 17 Mar 2017 17:07:23 -0400 References: <20170227193857.9368-1-marex@denx.de> From: Marek Vasut Message-ID: <8ac9381c-4d71-f43b-4c1e-bfa3bf687e1c@denx.de> Date: Fri, 17 Mar 2017 22:01:32 +0100 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH V2] nios2: iic: Convert CPU prop to qom link List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: QEMU Developers , Jeff Da Silva , Chris Wulff , Alexander Graf , Markus Armbruster , Sandra Loosemore , Ley Foon Tan , Yves Vandervennet , Igor Mammedov , Richard Henderson On 03/17/2017 05:51 PM, Peter Maydell wrote: > On 27 February 2017 at 19:38, Marek Vasut 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 >> Cc: Alexander Graf >> Cc: Chris Wulff >> Cc: Igor Mammedov >> Cc: Jeff Da Silva >> Cc: Ley Foon Tan >> Cc: Markus Armbruster >> Cc: Richard Henderson >> Cc: Sandra Loosemore >> Cc: Yves Vandervennet >> --- >> 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