On 12/5/20 5:15 PM, Claudio Fontana wrote:
> From: Eduardo Habkost <[email protected]>
>
> The TCG-specific CPU methods will be moved to a separate struct,
> to make it easier to move accel-specific code outside generic CPU
> code in the future. Start by moving tcg_initialize().
>
> The new CPUClass.tcg_opts field may eventually become a pointer,
> but keep it an embedded struct for now, to make code conversion
> easier.
>
> Signed-off-by: Eduardo Habkost <[email protected]>
>
> [claudio: make the tcg code build for CONFIG_TCG only]
>
> Signed-off-by: Claudio Fontana <[email protected]>
> Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
> ---
> MAINTAINERS | 1 +
> cpu.c | 6 +++++-
> include/hw/core/cpu.h | 9 ++++++++-
> include/hw/core/tcg-cpu-ops.h | 25 +++++++++++++++++++++++++
> target/alpha/cpu.c | 2 +-
> target/arm/cpu.c | 2 +-
> target/avr/cpu.c | 2 +-
> target/cris/cpu.c | 12 ++++++------
> target/hppa/cpu.c | 2 +-
> target/i386/tcg-cpu.c | 2 +-
> target/lm32/cpu.c | 2 +-
> target/m68k/cpu.c | 2 +-
> target/microblaze/cpu.c | 2 +-
> target/mips/cpu.c | 2 +-
> target/moxie/cpu.c | 2 +-
> target/nios2/cpu.c | 2 +-
> target/openrisc/cpu.c | 2 +-
> target/ppc/translate_init.c.inc | 2 +-
> target/riscv/cpu.c | 2 +-
> target/rx/cpu.c | 2 +-
> target/s390x/cpu.c | 2 +-
> target/sh4/cpu.c | 2 +-
> target/sparc/cpu.c | 2 +-
> target/tilegx/cpu.c | 2 +-
> target/tricore/cpu.c | 2 +-
> target/unicore32/cpu.c | 2 +-
> target/xtensa/cpu.c | 2 +-
> 27 files changed, 67 insertions(+), 30 deletions(-)
> create mode 100644 include/hw/core/tcg-cpu-ops.h
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index f53f2678d8..d876f504a6 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1535,6 +1535,7 @@ F: qapi/machine.json
> F: qapi/machine-target.json
> F: include/hw/boards.h
> F: include/hw/core/cpu.h
> +F: include/hw/core/tcg-cpu-ops.h
> F: include/hw/cpu/cluster.h
> F: include/sysemu/numa.h
> T: git https://github.com/ehabkost/qemu.git machine-next
> diff --git a/cpu.c b/cpu.c
> index 0be5dcb6f3..27ad096cc4 100644
> --- a/cpu.c
> +++ b/cpu.c
> @@ -174,14 +174,18 @@ void cpu_exec_initfn(CPUState *cpu)
> void cpu_exec_realizefn(CPUState *cpu, Error **errp)
> {
> CPUClass *cc = CPU_GET_CLASS(cpu);
> +#ifdef CONFIG_TCG
> static bool tcg_target_initialized;
> +#endif /* CONFIG_TCG */
Maybe worth extract as tcg_target_initialized() method.
>
> cpu_list_add(cpu);
>
> +#ifdef CONFIG_TCG
> if (tcg_enabled() && !tcg_target_initialized) {
> tcg_target_initialized = true;
> - cc->tcg_initialize();
> + cc->tcg_ops.initialize();
> }
> +#endif /* CONFIG_TCG */
> tlb_init(cpu);
[...]
