From nobody Tue Feb 10 01:32:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1576558493; cv=none; d=zohomail.com; s=zohoarc; b=ZYlE6uwcLETLld7Q+e9eOkB7022v7jsJ1O8ZkRM9TpJgBV7UteoxqUyvW39JECGtWhngNGDHbP0gspjidp1lqPFA2u+g9NiZzO/EAM5a5Y5BjFv+S59kTIXn+bSjMqIzoym3YUh6KnrOWrZcu3MdJLU/r2mV4gvvE1sDFDRbthI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576558493; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+e+iIL+EbW4vhzom+OvR4XLIK1zMLb8CPI3R2254KC4=; b=QJdMavG0y6V8IBqb0KaxqAXIdVzZ0XpXZWvuY/z5/9sIgAq0x9FEH9obIvvD7/E3Cm702i69I8FOZBSOBVWH3RT7EElQ+S1bb1Wp6+EFS5ZsofviGrepvAzwfNi3S8mHqjx81t76IKYNRDYey06vJAdO6U5/9Jj9r4ruDVjxVRU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576558493208234.65026903630007; Mon, 16 Dec 2019 20:54:53 -0800 (PST) Received: from localhost ([::1]:35222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ih4sl-0005b5-KL for importer@patchew.org; Mon, 16 Dec 2019 23:54:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33616) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ih4i7-0008EL-UI for qemu-devel@nongnu.org; Mon, 16 Dec 2019 23:43:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ih4i1-0005T4-E1 for qemu-devel@nongnu.org; Mon, 16 Dec 2019 23:43:48 -0500 Received: from ozlabs.org ([203.11.71.1]:39847) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ih4i1-0005Kk-28; Mon, 16 Dec 2019 23:43:45 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 47cQWR3VHcz9sSd; Tue, 17 Dec 2019 15:43:29 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1576557811; bh=DkwFpJiNBFvJaIJBPjZaMoONoRs9YS2BWDzgU84Y6bA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PnashcfmSEHJD4E3gp+tRqqzF360/15aSBhso7G9J9uRrxiDdjepUjWYHVp5q2Z1W vIgtsByciFPSUUp1gt8rpxFp8v5waGI+H8pEVIeNXO/+K+AZNhjUHh6xN7OLYl/2kF 34GPYZCrOi4eMH95Ij+vkgSAPhypWmrwlCll1atY= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 14/88] xics: Link ICP_PROP_CPU property to ICPState::cs pointer Date: Tue, 17 Dec 2019 15:42:08 +1100 Message-Id: <20191217044322.351838-15-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191217044322.351838-1-david@gibson.dropbear.id.au> References: <20191217044322.351838-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 203.11.71.1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, aik@ozlabs.ru, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Greg Kurz The ICP object has both a pointer and an ICP_PROP_CPU property pointing to the cpu. Confusing bugs could arise if these ever go out of sync. Change the property definition so that it explicitly sets the pointer. The property isn't optional : not being able to set the link is a bug and QEMU should rather abort than exit in this case. Signed-off-by: Greg Kurz Message-Id: <157403284709.409804.16142099083325945141.stgit@bahia.lan> Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: David Gibson --- hw/intc/xics.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 35dddb8867..0b259a09c5 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -305,25 +305,13 @@ void icp_reset(ICPState *icp) static void icp_realize(DeviceState *dev, Error **errp) { ICPState *icp =3D ICP(dev); - PowerPCCPU *cpu; CPUPPCState *env; - Object *obj; Error *err =3D NULL; =20 assert(icp->xics); + assert(icp->cs); =20 - obj =3D object_property_get_link(OBJECT(dev), ICP_PROP_CPU, &err); - if (!obj) { - error_propagate_prepend(errp, err, - "required link '" ICP_PROP_CPU - "' not found: "); - return; - } - - cpu =3D POWERPC_CPU(obj); - icp->cs =3D CPU(obj); - - env =3D &cpu->env; + env =3D &POWERPC_CPU(icp->cs)->env; switch (PPC_INPUT(env)) { case PPC_FLAGS_INPUT_POWER7: icp->output =3D env->irq_inputs[POWER7_INPUT_INT]; @@ -363,6 +351,7 @@ static void icp_unrealize(DeviceState *dev, Error **err= p) static Property icp_properties[] =3D { DEFINE_PROP_LINK(ICP_PROP_XICS, ICPState, xics, TYPE_XICS_FABRIC, XICSFabric *), + DEFINE_PROP_LINK(ICP_PROP_CPU, ICPState, cs, TYPE_CPU, CPUState *), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -397,8 +386,7 @@ Object *icp_create(Object *cpu, const char *type, XICSF= abric *xi, Error **errp) object_property_add_child(cpu, type, obj, &error_abort); object_unref(obj); object_property_set_link(obj, OBJECT(xi), ICP_PROP_XICS, &error_abort); - object_ref(cpu); - object_property_add_const_link(obj, ICP_PROP_CPU, cpu, &error_abort); + object_property_set_link(obj, cpu, ICP_PROP_CPU, &error_abort); object_property_set_bool(obj, true, "realized", &local_err); if (local_err) { object_unparent(obj); @@ -413,7 +401,6 @@ void icp_destroy(ICPState *icp) { Object *obj =3D OBJECT(icp); =20 - object_unref(object_property_get_link(obj, ICP_PROP_CPU, &error_abort)= ); object_unparent(obj); } =20 --=20 2.23.0