diff options
| author | Cédric Le Goater | 2017-02-27 15:29:28 +0100 |
|---|---|---|
| committer | David Gibson | 2017-03-01 01:23:40 +0100 |
| commit | 852ad27e14325be69c1afa2bb940ba7dc2ba1a8f (patch) | |
| tree | 643195104a72a0d1a2254336a93e85b97641c942 /include/hw/ppc | |
| parent | ppc/xics: register the reset handler of ICP objects (diff) | |
| download | qemu-852ad27e14325be69c1afa2bb940ba7dc2ba1a8f.tar.gz qemu-852ad27e14325be69c1afa2bb940ba7dc2ba1a8f.tar.xz 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>
Diffstat (limited to 'include/hw/ppc')
| -rw-r--r-- | include/hw/ppc/spapr.h | 3 | ||||
| -rw-r--r-- | include/hw/ppc/xics.h | 2 |
2 files changed, 3 insertions, 2 deletions
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" |