From d49c603b37e6c9d025f58c09f55d0c7cefe88987 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Le=20Goater?= Date: Tue, 18 Oct 2016 10:06:33 +0200 Subject: [PATCH] ppc/xics: add a XICSState backlink in ICPState MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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édric 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 c051eebb44..9f2c81a7f1 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 = xics; } } diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 573b192053..1468d6a890 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; }; #define TYPE_ICS_BASE "ics-base" -- 2.11.4.GIT