From nobody Thu Nov 6 19:10:41 2025 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 1488344451105130.5507647077916; Tue, 28 Feb 2017 21:00:51 -0800 (PST) Received: from localhost ([::1]:38417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciwNd-0005e1-Nu for importer@patchew.org; Wed, 01 Mar 2017 00:00:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciw7x-0008FD-C4 for qemu-devel@nongnu.org; Tue, 28 Feb 2017 23:44:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ciw7t-0000Ev-6Q for qemu-devel@nongnu.org; Tue, 28 Feb 2017 23:44:37 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:36179) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ciw7s-0000By-Ka; Tue, 28 Feb 2017 23:44:33 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3vY2sV3ptyz9sPJ; Wed, 1 Mar 2017 15:44:13 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1488343454; bh=L0gzijZLDUYU3o0pq+5Knfa/xnNabuqzdQD71bCFFXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dLMIE2+k5XH7C22CCVZNKA3a4WzfuZgbgyup4l0zgk1Ax8ErAIC5c/KJV+emkexXH ln3wTO1iENby0stXxIZBmFIxljI8h4Qtz3BaPDWky5GBvCJIvdvum2b2vkAXlhCFv4 zfW7yHfVHNrUF2Ksnn3Jh8Tj6ts1rXvgzpm8x47o= From: David Gibson To: peter.maydell@linaro.org Date: Wed, 1 Mar 2017 15:43:59 +1100 Message-Id: <20170301044405.1792-45-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170301044405.1792-1-david@gibson.dropbear.id.au> References: <20170301044405.1792-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 44/50] ppc/xics: move the ICP array under the sPAPR machine 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: lvivier@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, agraf@suse.de, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: C=C3=A9dric Le Goater This is the last step to remove the XICSState abstraction and have the machine hold all the objects related to interrupts : ICSs and ICPs. Signed-off-by: C=C3=A9dric Le Goater Signed-off-by: David Gibson --- hw/ppc/spapr.c | 17 ++++++++--------- include/hw/ppc/spapr.h | 3 +++ include/hw/ppc/xics.h | 2 -- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 8b2d21c..47eb503 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -124,15 +124,15 @@ static XICSState *try_create_xics(sPAPRMachineState *= spapr, goto error; } =20 - xics->ss =3D g_malloc0(nr_servers * sizeof(ICPState)); - xics->nr_servers =3D nr_servers; + spapr->icps =3D g_malloc0(nr_servers * sizeof(ICPState)); + spapr->nr_servers =3D nr_servers; =20 for (i =3D 0; i < nr_servers; i++) { - ICPState *icp =3D &xics->ss[i]; + ICPState *icp =3D &spapr->icps[i]; =20 object_initialize(icp, sizeof(*icp), type_icp); qdev_set_parent_bus(DEVICE(icp), sysbus_get_default()); - object_property_add_child(OBJECT(xics), "icp[*]", OBJECT(icp), NUL= L); + object_property_add_child(OBJECT(spapr), "icp[*]", OBJECT(icp), NU= LL); object_property_add_const_link(OBJECT(icp), "xics", OBJECT(xi), NU= LL); object_property_set_bool(OBJECT(icp), true, "realized", &err); if (err) { @@ -967,7 +967,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, _FDT(fdt_setprop_cell(fdt, 0, "#size-cells", 2)); =20 /* /interrupt controller */ - spapr_dt_xics(spapr->xics->nr_servers, fdt, PHANDLE_XICP); + spapr_dt_xics(spapr->nr_servers, fdt, PHANDLE_XICP); =20 ret =3D spapr_populate_memory(spapr, fdt); if (ret < 0) { @@ -2989,8 +2989,7 @@ static ICPState *spapr_icp_get(XICSFabric *xi, int se= rver) { sPAPRMachineState *spapr =3D SPAPR_MACHINE(xi); =20 - return (server < spapr->xics->nr_servers) ? &spapr->xics->ss[server] : - NULL; + return (server < spapr->nr_servers) ? &spapr->icps[server] : NULL; } =20 static void spapr_icp_resend(XICSFabric *xi) @@ -2998,8 +2997,8 @@ static void spapr_icp_resend(XICSFabric *xi) sPAPRMachineState *spapr =3D SPAPR_MACHINE(xi); int i; =20 - for (i =3D 0; i < spapr->xics->nr_servers; i++) { - icp_resend(&spapr->xics->ss[i]); + for (i =3D 0; i < spapr->nr_servers; i++) { + icp_resend(&spapr->icps[i]); } } =20 diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 21e506b..f5bbb04 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -95,6 +95,9 @@ struct sPAPRMachineState { /*< public >*/ char *kvm_type; MemoryHotplugState hotplug_memory; + + uint32_t nr_servers; + ICPState *icps; }; =20 #define H_SUCCESS 0 diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index f618848..50a5933 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -79,8 +79,6 @@ struct XICSState { /*< private >*/ DeviceState parent_obj; /*< public >*/ - uint32_t nr_servers; - ICPState *ss; }; =20 #define TYPE_ICP "icp" --=20 2.9.3