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

[Greg Kurz]

On Thu, 17 Jan 2019 08:53:27 +0100
Cédric Le Goater <address@hidden> wrote:

> Signed-off-by: Cédric Le Goater <address@hidden>
> ---

The patch looks good, but I think it would be even better to apply this before
Thomas's -std=c99 patchset. This would allow to get rid of the controversial
"ppc: Fix duplicated typedefs to be able to compile  with Clang in gnu99 mode"
patch :)

>  target/ppc/cpu.h | 9 ---------
>  1 file changed, 9 deletions(-)
> 
> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> index bde4dff1ba80..2c22292e7f41 100644
> --- a/target/ppc/cpu.h
> +++ b/target/ppc/cpu.h
> @@ -23,11 +23,6 @@
>  #include "qemu-common.h"
>  #include "qemu/int128.h"
>  
> -#ifndef CONFIG_USER_ONLY
> -#include "hw/ppc/xive.h" /* for XiveTCTX */
> -#include "hw/ppc/xics.h" /* for ICPState */
> -#endif
> -
>  //#define PPC_EMULATE_32BITS_HYPV
>  
>  #if defined (TARGET_PPC64)
> @@ -1203,10 +1198,6 @@ struct PowerPCCPU {
>      void *machine_data;
>      int32_t node_id; /* NUMA node this CPU belongs to */
>      PPCHash64Options *hash64_opts;
> -#ifndef CONFIG_USER_ONLY
> -    ICPState *icp;
> -    XiveTCTX *tctx;
> -#endif
>  
>      /* Fields related to migration compatibility hacks */
>      bool pre_2_8_migration;