From: Cédric Le Goater <clg@kaod.org>
Date: Tue, 18 Oct 2016 08:06:33 +0000 (+0200)
Subject: ppc/xics: add a XICSState backlink in ICPState
X-Git-Tag: v2.8.0-rc0~52^2~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d49c603b37e6c9d025f58c09f55d0c7cefe88987;p=thirdparty%2Fqemu.git

ppc/xics: add a XICSState backlink in ICPState

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 <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---

diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index c051eebb446..9f2c81a7f14 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 573b1920536..1468d6a8908 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"