From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzMd1-0007pB-Ch for qemu-devel@nongnu.org; Wed, 26 Oct 2016 07:44:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzMd0-00052K-70 for qemu-devel@nongnu.org; Wed, 26 Oct 2016 07:44:19 -0400 From: David Gibson Date: Wed, 26 Oct 2016 22:42:21 +1100 Message-Id: <1477482173-8761-18-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1477482173-8761-1-git-send-email-david@gibson.dropbear.id.au> References: <1477482173-8761-1-git-send-email-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 17/49] ppc/xics: add a XICSState backlink in ICPState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: agraf@suse.de, clg@kaod.org, thuth@redhat.com, lvivier@redhat.com, aik@ozlabs.ru, mark.cave-ayland@ilande.co.uk, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson From: C=C3=A9dric Le Goater The link will be used to change the API of the icp_* routines which are still using an XICSState as an argument. Signed-off-by: C=C3=A9dric Le Goater Signed-off-by: David Gibson --- hw/intc/xics.c | 1 + include/hw/ppc/xics.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index c051eeb..9f2c81a 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -198,6 +198,7 @@ void xics_set_nr_servers(XICSState *xics, uint32_t nr= _servers, object_initialize(icp, sizeof(*icp), typename); snprintf(name, sizeof(name), "icp[%d]", i); object_property_add_child(OBJECT(xics), name, OBJECT(icp), errp)= ; + icp->xics =3D xics; } } =20 diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 573b192..1468d6a 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -117,6 +117,8 @@ struct ICPState { uint8_t mfrr; qemu_irq output; bool cap_irq_xics_enabled; + + XICSState *xics; }; =20 #define TYPE_ICS_BASE "ics-base" --=20 2.7.4