Re: [Qemu-devel] [PATCH v2 4/7] target: Include softmmu_exec.h where forgotten

[Aurelien Jarno <aurelien@aurel32.net>]

On Thu, Aug 29, 2013 at 03:05:58PM -0700, Richard Henderson wrote:
> Several targets forgot to include softmmu_exec.h, which would
> break them with a header cleanup to follow.
> 
> Signed-off-by: Richard Henderson <rth@twiddle.net>
> ---
>  target-lm32/op_helper.c      | 2 ++
>  target-moxie/helper.c        | 1 +
>  target-ppc/mmu_helper.c      | 2 ++
>  target-unicore32/op_helper.c | 2 ++
>  target-xtensa/op_helper.c    | 1 +
>  5 files changed, 8 insertions(+)
> 
> diff --git a/target-lm32/op_helper.c b/target-lm32/op_helper.c
> index 2dab9f2..8f5ef55 100644
> --- a/target-lm32/op_helper.c
> +++ b/target-lm32/op_helper.c
> @@ -6,6 +6,8 @@
>  #include "hw/lm32/lm32_pic.h"
>  #include "hw/char/lm32_juart.h"
>  
> +#include "exec/softmmu_exec.h"
> +
>  #if !defined(CONFIG_USER_ONLY)
>  #define MMUSUFFIX _mmu
>  #define SHIFT 0
> diff --git a/target-moxie/helper.c b/target-moxie/helper.c
> index b12e4ff..7859102 100644
> --- a/target-moxie/helper.c
> +++ b/target-moxie/helper.c
> @@ -25,6 +25,7 @@
>  #include "cpu.h"
>  #include "mmu.h"
>  #include "exec/exec-all.h"
> +#include "exec/softmmu_exec.h"
>  #include "qemu/host-utils.h"
>  #include "helper.h"
>  
> diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c
> index 5dd4e05..44f04e5 100644
> --- a/target-ppc/mmu_helper.c
> +++ b/target-ppc/mmu_helper.c
> @@ -2871,6 +2871,8 @@ void helper_booke206_tlbflush(CPUPPCState *env, uint32_t type)
>  
>  /*****************************************************************************/
>  
> +#include "exec/softmmu_exec.h"
> +
>  #define MMUSUFFIX _mmu
>  
>  #define SHIFT 0
> diff --git a/target-unicore32/op_helper.c b/target-unicore32/op_helper.c
> index 6443ffe..4f9f41e 100644
> --- a/target-unicore32/op_helper.c
> +++ b/target-unicore32/op_helper.c
> @@ -239,6 +239,8 @@ uint32_t HELPER(ror_cc)(CPUUniCore32State *env, uint32_t x, uint32_t i)
>  }
>  
>  #ifndef CONFIG_USER_ONLY
> +#include "exec/softmmu_exec.h"
> +
>  #define MMUSUFFIX _mmu
>  
>  #define SHIFT 0
> diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c
> index 01123af..cf97025 100644
> --- a/target-xtensa/op_helper.c
> +++ b/target-xtensa/op_helper.c
> @@ -28,6 +28,7 @@
>  #include "cpu.h"
>  #include "helper.h"
>  #include "qemu/host-utils.h"
> +#include "exec/softmmu_exec.h"
>  
>  static void do_unaligned_access(CPUXtensaState *env,
>          target_ulong addr, int is_write, int is_user, uintptr_t retaddr);

Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net