Re: [PATCH 08/11] accel/tcg: Rename target-specific 'internal.h' -> 'internal-target.h'

[Anton Johansson]

On 14/09/23, Philippe Mathieu-Daudé wrote:
> accel/tcg/internal.h contains target specific declarations.
> Unit files including it become "target tainted": they can not
> be compiled as target agnostic. Rename using the '-target'
> suffix to make this explicit.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>  accel/tcg/{internal.h => internal-target.h} | 6 +++---
>  accel/tcg/cpu-exec-common.c                 | 2 +-
>  accel/tcg/cpu-exec.c                        | 2 +-
>  accel/tcg/cputlb.c                          | 2 +-
>  accel/tcg/monitor.c                         | 2 +-
>  accel/tcg/tb-maint.c                        | 2 +-
>  accel/tcg/tcg-all.c                         | 2 +-
>  accel/tcg/translate-all.c                   | 2 +-
>  accel/tcg/translator.c                      | 2 +-
>  accel/tcg/user-exec.c                       | 2 +-
>  10 files changed, 12 insertions(+), 12 deletions(-)
>  rename accel/tcg/{internal.h => internal-target.h} (96%)
> 
> diff --git a/accel/tcg/internal.h b/accel/tcg/internal-target.h
> similarity index 96%
> rename from accel/tcg/internal.h
> rename to accel/tcg/internal-target.h
> index cd6b9eb7f0..4ce3b29056 100644
> --- a/accel/tcg/internal.h
> +++ b/accel/tcg/internal-target.h
> @@ -1,13 +1,13 @@
>  /*
> - * Internal execution defines for qemu
> + * Internal execution defines for qemu (target specific)
>   *
>   *  Copyright (c) 2003 Fabrice Bellard
>   *
>   * SPDX-License-Identifier: LGPL-2.1-or-later
>   */
>  
> -#ifndef ACCEL_TCG_INTERNAL_H
> -#define ACCEL_TCG_INTERNAL_H
> +#ifndef ACCEL_TCG_INTERNAL_TARGET_H
> +#define ACCEL_TCG_INTERNAL_TARGET_H
>  
>  #include "exec/exec-all.h"
>  #include "exec/translate-all.h"
> diff --git a/accel/tcg/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c
> index 8ac2af4d0c..55980417b4 100644
> --- a/accel/tcg/cpu-exec-common.c
> +++ b/accel/tcg/cpu-exec-common.c
> @@ -22,7 +22,7 @@
>  #include "sysemu/tcg.h"
>  #include "exec/exec-all.h"
>  #include "qemu/plugin.h"
> -#include "internal.h"
> +#include "internal-target.h"
>  
>  bool tcg_allowed;
>  
> diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
> index 0e7eeef001..f5625e047a 100644
> --- a/accel/tcg/cpu-exec.c
> +++ b/accel/tcg/cpu-exec.c
> @@ -42,7 +42,7 @@
>  #include "tb-jmp-cache.h"
>  #include "tb-hash.h"
>  #include "tb-context.h"
> -#include "internal.h"
> +#include "internal-target.h"
>  
>  /* -icount align implementation. */
>  
> diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
> index 31e34700ea..a912d746a9 100644
> --- a/accel/tcg/cputlb.c
> +++ b/accel/tcg/cputlb.c
> @@ -35,7 +35,7 @@
>  #include "exec/translate-all.h"
>  #include "trace.h"
>  #include "tb-hash.h"
> -#include "internal.h"
> +#include "internal-target.h"
>  #ifdef CONFIG_PLUGIN
>  #include "qemu/plugin-memory.h"
>  #endif
> diff --git a/accel/tcg/monitor.c b/accel/tcg/monitor.c
> index d48de23999..30724fdb98 100644
> --- a/accel/tcg/monitor.c
> +++ b/accel/tcg/monitor.c
> @@ -16,7 +16,7 @@
>  #include "sysemu/cpu-timers.h"
>  #include "sysemu/tcg.h"
>  #include "tcg/tcg.h"
> -#include "internal.h"
> +#include "internal-target.h"
>  
>  
>  static void dump_drift_info(GString *buf)
> diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c
> index 32ae8af61c..85cf51445d 100644
> --- a/accel/tcg/tb-maint.c
> +++ b/accel/tcg/tb-maint.c
> @@ -29,7 +29,7 @@
>  #include "tcg/tcg.h"
>  #include "tb-hash.h"
>  #include "tb-context.h"
> -#include "internal.h"
> +#include "internal-target.h"
>  
>  
>  /* List iterators for lists of tagged pointers in TranslationBlock. */
> diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
> index 03dfd67e9e..b32e0b80ec 100644
> --- a/accel/tcg/tcg-all.c
> +++ b/accel/tcg/tcg-all.c
> @@ -38,7 +38,7 @@
>  #if !defined(CONFIG_USER_ONLY)
>  #include "hw/boards.h"
>  #endif
> -#include "internal.h"
> +#include "internal-target.h"
>  
>  struct TCGState {
>      AccelState parent_obj;
> diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
> index 83e07b830f..6c09b7f50d 100644
> --- a/accel/tcg/translate-all.c
> +++ b/accel/tcg/translate-all.c
> @@ -61,7 +61,7 @@
>  #include "tb-jmp-cache.h"
>  #include "tb-hash.h"
>  #include "tb-context.h"
> -#include "internal.h"
> +#include "internal-target.h"
>  #include "perf.h"
>  #include "tcg/insn-start-words.h"
>  
> diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
> index d9fcb4cbe8..65219b52eb 100644
> --- a/accel/tcg/translator.c
> +++ b/accel/tcg/translator.c
> @@ -14,7 +14,7 @@
>  #include "exec/translator.h"
>  #include "exec/plugin-gen.h"
>  #include "tcg/tcg-op-common.h"
> -#include "internal.h"
> +#include "internal-target.h"
>  
>  static void gen_io_start(void)
>  {
> diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
> index 17f9aff0cf..f925dd0305 100644
> --- a/accel/tcg/user-exec.c
> +++ b/accel/tcg/user-exec.c
> @@ -29,7 +29,7 @@
>  #include "qemu/atomic128.h"
>  #include "trace/trace-root.h"
>  #include "tcg/tcg-ldst.h"
> -#include "internal.h"
> +#include "internal-target.h"
>  
>  __thread uintptr_t helper_retaddr;
>  
> -- 
> 2.41.0
> 
Reviewed-by: Anton Johansson <anjo@rev.ng>