[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 39/39] accel/tcg: Restrict tcg_exec_[un]realizefn() to TCG
From: |
Richard Henderson |
Subject: |
[PATCH v3 39/39] accel/tcg: Restrict tcg_exec_[un]realizefn() to TCG |
Date: |
Sat, 16 Sep 2023 14:41:23 -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>
Message-Id: <20230915190009.68404-6-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/internal-target.h | 3 +++
include/exec/cpu-all.h | 2 --
accel/tcg/tcg-all.c | 2 ++
cpu-target.c | 8 --------
4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/accel/tcg/internal-target.h b/accel/tcg/internal-target.h
index 932bbe4b63..4e36cf858e 100644
--- a/accel/tcg/internal-target.h
+++ b/accel/tcg/internal-target.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 6c1db14842..5340907cfd 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -410,8 +410,6 @@ static inline bool tlb_hit(uint64_t tlb_addr, vaddr addr)
/* accel/tcg/cpu-exec.c */
int cpu_exec(CPUState *cpu);
-bool tcg_exec_realizefn(CPUState *cpu, Error **errp);
-void tcg_exec_unrealizefn(CPUState *cpu);
/* Validate correct placement of CPUArchState. */
QEMU_BUILD_BUG_ON(offsetof(ArchCPU, parent_obj) != 0);
diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
index b32e0b80ec..a40e0aee37 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->realize_cpu = tcg_exec_realizefn;
+ ac->unrealize_cpu = tcg_exec_unrealizefn;
ac->allowed = &tcg_allowed;
ac->gdbstub_supported_sstep_flags = tcg_gdbstub_supported_sstep_flags;
diff --git a/cpu-target.c b/cpu-target.c
index b928bbed50..1a8e730bed 100644
--- a/cpu-target.c
+++ b/cpu-target.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);
@@ -190,9 +185,6 @@ void cpu_exec_unrealizefn(CPUState *cpu)
* accel_cpu_unrealize, which may free fields using call_rcu.
*/
accel_cpu_unrealize(cpu);
- if (tcg_enabled()) {
- tcg_exec_unrealizefn(cpu);
- }
}
/*
--
2.34.1
- [PATCH v3 34/39] accel/tcg: Make cpu-exec-common.c a target agnostic unit, (continued)
- [PATCH v3 34/39] accel/tcg: Make cpu-exec-common.c a target agnostic unit, Richard Henderson, 2023/09/16
- [PATCH v3 20/39] accel/tcg: Use CPUState in atomicity helpers, Richard Henderson, 2023/09/16
- [PATCH v3 27/39] accel: Make accel-blocker.o target agnostic, Richard Henderson, 2023/09/16
- [PATCH v3 31/39] accel/tcg: Rename target-specific 'internal.h' -> 'internal-target.h', Richard Henderson, 2023/09/16
- [PATCH v3 36/39] accel: Introduce accel_cpu_unrealize() stub, Richard Henderson, 2023/09/16
- [PATCH v3 22/39] accel/tcg: Unify user and softmmu do_[st|ld]*_mmu(), Richard Henderson, 2023/09/16
- [PATCH v3 23/39] accel/tcg: move ld/st helpers to ldst_common.c.inc, Richard Henderson, 2023/09/16
- [PATCH v3 25/39] exec: Move cpu_loop_foo() target agnostic functions to 'cpu-common.h', Richard Henderson, 2023/09/16
- [PATCH v3 37/39] accel: Declare AccelClass::[un]realize_cpu() handlers, Richard Henderson, 2023/09/16
- [PATCH v3 39/39] accel/tcg: Restrict tcg_exec_[un]realizefn() to TCG,
Richard Henderson <=