Re: [PATCH 09/18] target/i386: Inline target specific TARGET_DEFAULT_CPU_TYPE definition

[Richard Henderson]

On 10/10/23 02:28, Philippe Mathieu-Daudé wrote:
> TARGET_DEFAULT_CPU_TYPE depends on the TARGET_X86_64 definition
> which is target specific. Such target specific definition taint
> "cpu-qom.h".
>
> Since "cpu-qom.h" must be target agnostic, remove this target
> specific definition uses by inlining TARGET_DEFAULT_CPU_TYPE in
> the two machines using it.
>
> "target/i386/cpu-qom.h" is now fully target agnostic.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   target/i386/cpu.h | 6 ------
>   hw/i386/microvm.c | 6 +++++-
>   hw/i386/pc.c      | 6 +++++-
>   3 files changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/target/i386/cpu.h b/target/i386/cpu.h
> index 862e4f1ff5..7c976971c7 100644
> --- a/target/i386/cpu.h
> +++ b/target/i386/cpu.h
> @@ -2243,12 +2243,6 @@ uint64_t cpu_get_tsc(CPUX86State *env);
>   
>   #define CPU_RESOLVING_TYPE TYPE_X86_CPU
>   
> -#ifdef TARGET_X86_64
> -#define TARGET_DEFAULT_CPU_TYPE X86_CPU_TYPE_NAME("qemu64")
> -#else
> -#define TARGET_DEFAULT_CPU_TYPE X86_CPU_TYPE_NAME("qemu32")
> -#endif
> -
>   #define cpu_list x86_cpu_list

This isn't cpu-qom.h, so the entire patch description is off...


r~