From nobody Sun May 5 21:42:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1489784864690846.8972890321046; Fri, 17 Mar 2017 14:07:44 -0700 (PDT) Received: from localhost ([::1]:50763 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coz67-0005Ap-Cc for importer@patchew.org; Fri, 17 Mar 2017 17:07:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coz5P-00059V-GC for qemu-devel@nongnu.org; Fri, 17 Mar 2017 17:07:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coz5K-0007TY-Td for qemu-devel@nongnu.org; Fri, 17 Mar 2017 17:06:59 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:41264) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1coz5K-0007T3-Mh for qemu-devel@nongnu.org; Fri, 17 Mar 2017 17:06:54 -0400 Received: from mail.nefkom.net (unknown [192.168.6.184]) by mail-out.m-online.net (Postfix) with ESMTP id 3vlHvr3Xnyz3hjcZ; Fri, 17 Mar 2017 22:06:48 +0100 (CET) Received: from kurokawa.lan (unknown [195.140.253.167]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 3vlHvq4LyYzvdWQ; Fri, 17 Mar 2017 22:06:47 +0100 (CET) X-Auth-Info: HF4nGCPdtX3Xb19w0h/Z57Ba1lXj/gl7ff09XEX69i8= From: Marek Vasut To: qemu-devel@nongnu.org Date: Fri, 17 Mar 2017 22:06:27 +0100 Message-Id: <20170317210627.23532-1-marex@denx.de> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 212.18.0.9 Subject: [Qemu-devel] [PATCH V3] nios2: iic: Convert CPU prop to qom link X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Vasut , Jeff Da Silva , Chris Wulff , Alexander Graf , Markus Armbruster , Sandra Loosemore , Ley Foon Tan , Yves Vandervennet , Igor Mammedov , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Markus Armbruster --- V2: Retain dc->cannot_instantiate_with_device_add_yet =3D true in altera_iic_class_init() since the device is still not device_add() creatable. V3: Update the comment in altera_iic_class_init() --- hw/intc/nios2_iic.c | 13 +++++-------- hw/nios2/10m50_devboard.c | 3 ++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/hw/intc/nios2_iic.c b/hw/intc/nios2_iic.c index 818ab1b315..190b6fdbf3 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); } =20 -static Property altera_iic_properties[] =3D { - DEFINE_PROP_PTR("cpu", AlteraIIC, cpu), - DEFINE_PROP_END_OF_LIST(), -}; - static void altera_iic_realize(DeviceState *dev, Error **errp) { struct AlteraIIC *pv =3D ALTERA_IIC(dev); + Error *err =3D NULL; =20 + pv->cpu =3D 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,7 @@ static void altera_iic_class_init(ObjectClass *klass, voi= d *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - dc->props =3D altera_iic_properties; - /* Reason: pointer property "cpu" */ + /* Reason: needs to be wired up, e.g. by nios2_10m50_ghrd_init() */ dc->cannot_instantiate_with_device_add_yet =3D true; dc->realize =3D 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) =20 /* Register: Internal Interrupt Controller (IIC) */ dev =3D 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 =3D 0; i < 32; i++) { --=20 2.11.0