diff options
| author | Cédric Le Goater <clg@kaod.org> | 2017-02-27 15:29:28 +0100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2017-03-01 11:23:40 +1100 |
| commit | 852ad27e14325be69c1afa2bb940ba7dc2ba1a8f (patch) | |
| tree | 643195104a72a0d1a2254336a93e85b97641c942 | |
| parent | 20147f2fceaa8a89176e49e1941f741d12a3364c (diff) | |
| download | focaccia-qemu-852ad27e14325be69c1afa2bb940ba7dc2ba1a8f.tar.gz focaccia-qemu-852ad27e14325be69c1afa2bb940ba7dc2ba1a8f.zip | |
ppc/xics: move the ICP array under the sPAPR machine
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édric Le Goater <clg@kaod.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | hw/ppc/spapr.c | 17 | ||||
| -rw-r--r-- | include/hw/ppc/spapr.h | 3 | ||||
| -rw-r--r-- | 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 8b2d21c15b..47eb503803 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -124,15 +124,15 @@ static XICSState *try_create_xics(sPAPRMachineState *spapr, goto error; } - xics->ss = g_malloc0(nr_servers * sizeof(ICPState)); - xics->nr_servers = nr_servers; + spapr->icps = g_malloc0(nr_servers * sizeof(ICPState)); + spapr->nr_servers = nr_servers; for (i = 0; i < nr_servers; i++) { - ICPState *icp = &xics->ss[i]; + ICPState *icp = &spapr->icps[i]; 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), NULL); + object_property_add_child(OBJECT(spapr), "icp[*]", OBJECT(icp), NULL); object_property_add_const_link(OBJECT(icp), "xics", OBJECT(xi), NULL); 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)); /* /interrupt controller */ - spapr_dt_xics(spapr->xics->nr_servers, fdt, PHANDLE_XICP); + spapr_dt_xics(spapr->nr_servers, fdt, PHANDLE_XICP); ret = spapr_populate_memory(spapr, fdt); if (ret < 0) { @@ -2989,8 +2989,7 @@ static ICPState *spapr_icp_get(XICSFabric *xi, int server) { sPAPRMachineState *spapr = SPAPR_MACHINE(xi); - return (server < spapr->xics->nr_servers) ? &spapr->xics->ss[server] : - NULL; + return (server < spapr->nr_servers) ? &spapr->icps[server] : NULL; } static void spapr_icp_resend(XICSFabric *xi) @@ -2998,8 +2997,8 @@ static void spapr_icp_resend(XICSFabric *xi) sPAPRMachineState *spapr = SPAPR_MACHINE(xi); int i; - for (i = 0; i < spapr->xics->nr_servers; i++) { - icp_resend(&spapr->xics->ss[i]); + for (i = 0; i < spapr->nr_servers; i++) { + icp_resend(&spapr->icps[i]); } } diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 21e506b13c..f5bbb040f9 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; }; #define H_SUCCESS 0 diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index f618848009..50a5933df5 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; }; #define TYPE_ICP "icp" |