ppc: remove the interrupt presenters from under PowerPCCPU

[Qemu-devel] [PATCH] ppc: remove the interrupt presenters from under PowerPCCPU

Posted by Cédric Le Goater 6 years, 9 months ago

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

Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 target/ppc/cpu.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index a62ff60414f4..2c22292e7f41 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;
-- 
2.20.1

Re: [Qemu-devel] [Qemu-ppc] [PATCH] ppc: remove the interrupt presenters from under PowerPCCPU

Posted by Greg Kurz 6 years, 9 months ago

On Mon, 28 Jan 2019 07:55:52 +0100
Cédric Le Goater <clg@kaod.org> wrote:

> 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>

>  target/ppc/cpu.h | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> index a62ff60414f4..2c22292e7f41 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;

Re: [Qemu-devel] [PATCH] ppc: remove the interrupt presenters from under PowerPCCPU

Posted by David Gibson 6 years, 9 months ago

On Mon, Jan 28, 2019 at 07:55:52AM +0100, Cédric Le Goater wrote:
> These fields have now been replaced by equivalents under the machine
> data.
> 
> Signed-off-by: Cédric Le Goater <clg@kaod.org>

Applied to ppc-for-4.0, thanks.

> ---
>  target/ppc/cpu.h | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> index a62ff60414f4..2c22292e7f41 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;

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson