[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/47] accel/tcg: Restrict tcg_exec_[un]realizefn() to TCG
From: |
Richard Henderson |
Subject: |
[PULL 07/47] accel/tcg: Restrict tcg_exec_[un]realizefn() to TCG |
Date: |
Tue, 3 Oct 2023 10:30:12 -0700 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
We don't need to expose these TCG-specific methods to the
whole code base. Register them as AccelClass handlers, they
will be called by the generic accel_cpu_[un]realize() methods.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Claudio Fontana <cfontana@suse.de>
Message-Id: <20231003123026.99229-8-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/internal.h | 3 +++
include/exec/cpu-all.h | 2 --
accel/tcg/tcg-all.c | 2 ++
cpu.c | 9 ---------
4 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/accel/tcg/internal.h b/accel/tcg/internal.h
index e8cbbde581..57ab397df1 100644
--- a/accel/tcg/internal.h
+++ b/accel/tcg/internal.h
@@ -80,6 +80,9 @@ bool tb_invalidate_phys_page_unwind(tb_page_addr_t addr,
uintptr_t pc);
void cpu_restore_state_from_tb(CPUState *cpu, TranslationBlock *tb,
uintptr_t host_pc);
+bool tcg_exec_realizefn(CPUState *cpu, Error **errp);
+void tcg_exec_unrealizefn(CPUState *cpu);
+
/* Return the current PC from CPU, which may be cached in TB. */
static inline vaddr log_pc(CPUState *cpu, const TranslationBlock *tb)
{
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index 1e5c530ee1..230525ebf7 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -422,8 +422,6 @@ void dump_exec_info(GString *buf);
/* accel/tcg/cpu-exec.c */
int cpu_exec(CPUState *cpu);
-bool tcg_exec_realizefn(CPUState *cpu, Error **errp);
-void tcg_exec_unrealizefn(CPUState *cpu);
/**
* cpu_set_cpustate_pointers(cpu)
diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
index 03dfd67e9e..8ab873a5ab 100644
--- a/accel/tcg/tcg-all.c
+++ b/accel/tcg/tcg-all.c
@@ -227,6 +227,8 @@ static void tcg_accel_class_init(ObjectClass *oc, void
*data)
AccelClass *ac = ACCEL_CLASS(oc);
ac->name = "tcg";
ac->init_machine = tcg_init_machine;
+ ac->cpu_common_realize = tcg_exec_realizefn;
+ ac->cpu_common_unrealize = tcg_exec_unrealizefn;
ac->allowed = &tcg_allowed;
ac->gdbstub_supported_sstep_flags = tcg_gdbstub_supported_sstep_flags;
diff --git a/cpu.c b/cpu.c
index 2a1eff948b..658d179582 100644
--- a/cpu.c
+++ b/cpu.c
@@ -140,11 +140,6 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp)
return;
}
- /* NB: errp parameter is unused currently */
- if (tcg_enabled()) {
- tcg_exec_realizefn(cpu, errp);
- }
-
/* Wait until cpu initialization complete before exposing cpu. */
cpu_list_add(cpu);
@@ -187,13 +182,9 @@ void cpu_exec_unrealizefn(CPUState *cpu)
cpu_list_remove(cpu);
/*
* Now that the vCPU has been removed from the RCU list, we can call
- * tcg_exec_unrealizefn and
* accel_cpu_common_unrealize, which may free fields using call_rcu.
*/
accel_cpu_common_unrealize(cpu);
- if (tcg_enabled()) {
- tcg_exec_unrealizefn(cpu);
- }
}
/*
--
2.34.1
- [PULL 20/47] accel/tcg: Remove cpu_set_cpustate_pointers, (continued)
- [PULL 20/47] accel/tcg: Remove cpu_set_cpustate_pointers, Richard Henderson, 2023/10/03
- [PULL 22/47] tcg: Remove TCGContext.tlb_fast_offset, Richard Henderson, 2023/10/03
- [PULL 26/47] accel/tcg: Modify atomic_mmu_lookup() to use CPUState, Richard Henderson, 2023/10/03
- [PULL 25/47] accel/tcg: Modify memory access functions to use CPUState, Richard Henderson, 2023/10/03
- [PULL 32/47] exec: Move cpu_loop_foo() target agnostic functions to 'cpu-common.h', Richard Henderson, 2023/10/03
- [PULL 13/47] accel/tcg: Validate placement of CPUNegativeOffsetState, Richard Henderson, 2023/10/03
- [PULL 29/47] accel/tcg: Unify user and softmmu do_[st|ld]*_mmu(), Richard Henderson, 2023/10/03
- [PULL 15/47] accel/tcg: Remove CPUState.icount_decr_ptr, Richard Henderson, 2023/10/03
- [PULL 17/47] accel/tcg: Remove cpu_neg(), Richard Henderson, 2023/10/03
- [PULL 11/47] target/arm: Remove size and alignment for cpu subclasses, Richard Henderson, 2023/10/03
- [PULL 07/47] accel/tcg: Restrict tcg_exec_[un]realizefn() to TCG,
Richard Henderson <=
- [PULL 16/47] accel/tcg: Move can_do_io to CPUNegativeOffsetState, Richard Henderson, 2023/10/03
- [PULL 21/47] accel/tcg: Remove env_neg(), Richard Henderson, 2023/10/03
- [PULL 24/47] accel/tcg: Modify probe_access_internal() to use CPUState, Richard Henderson, 2023/10/03
- [PULL 19/47] accel/tcg: Replace CPUState.env_ptr with cpu_env(), Richard Henderson, 2023/10/03
- [PULL 18/47] tcg: Rename cpu_env to tcg_env, Richard Henderson, 2023/10/03
- [PULL 23/47] accel/tcg: Modify tlb_*() to use CPUState, Richard Henderson, 2023/10/03
- [PULL 27/47] accel/tcg: Use CPUState in atomicity helpers, Richard Henderson, 2023/10/03
- [PULL 31/47] exec: Make EXCP_FOO definitions target agnostic, Richard Henderson, 2023/10/03
- [PULL 33/47] accel/tcg: Restrict dump_exec_info() declaration, Richard Henderson, 2023/10/03
- [PULL 28/47] accel/tcg: Remove env_tlb(), Richard Henderson, 2023/10/03