From: Cédric Le Goater <clg@kaod.org>
Date: Mon, 28 Jan 2019 06:55:52 +0000 (+0100)
Subject: ppc: remove the interrupt presenters from under PowerPCCPU
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=467657b3b70fff20704e9aa8d7ab989e768eeb96;p=qemu.git

ppc: remove the interrupt presenters from under PowerPCCPU

These fields have now been replaced by equivalents under the machine
data.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---

diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index a62ff60414..2c22292e7f 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -1178,9 +1178,6 @@ do {                                            \
 typedef struct PPCVirtualHypervisor PPCVirtualHypervisor;
 typedef struct PPCVirtualHypervisorClass PPCVirtualHypervisorClass;
 
-struct XiveTCTX;
-struct ICPState;
-
 /**
  * PowerPCCPU:
  * @env: #CPUPPCState
@@ -1198,8 +1195,6 @@ struct PowerPCCPU {
     int vcpu_id;
     uint32_t compat_pvr;
     PPCVirtualHypervisor *vhyp;
-    struct ICPState *icp;
-    struct XiveTCTX *tctx;
     void *machine_data;
     int32_t node_id; /* NUMA node this CPU belongs to */
     PPCHash64Options *hash64_opts;