aboutsummaryrefslogtreecommitdiff
path: root/accel
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@linaro.org>2023-09-15 22:55:45 +0200
committerPhilippe Mathieu-Daudé <philmd@linaro.org>2023-11-07 12:13:27 +0100
commitbb6cf6f0168efadb95cf3e41963ec295ad28a941 (patch)
treece4c36ff9afead66aea9f6f2949736dadb04e4c9 /accel
parent1b5120d74b1e19c12f8f476f8015a0ac87e11878 (diff)
downloadqemu-bb6cf6f0168efadb95cf3e41963ec295ad28a941.zip
qemu-bb6cf6f0168efadb95cf3e41963ec295ad28a941.tar.gz
qemu-bb6cf6f0168efadb95cf3e41963ec295ad28a941.tar.bz2
accel/tcg: Factor tcg_cpu_reset_hold() out
Factor the TCG specific code from cpu_common_reset_hold() to tcg_cpu_reset_hold() within tcg-accel-ops.c. Since this file is sysemu specific, we can inline tcg_flush_softmmu_tlb(), removing its declaration in "exec/cpu-common.h". Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Anton Johansson <anjo@rev.ng> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20230918104153.24433-4-philmd@linaro.org>
Diffstat (limited to 'accel')
-rw-r--r--accel/stubs/tcg-stub.c4
-rw-r--r--accel/tcg/tcg-accel-ops.c8
-rw-r--r--accel/tcg/translate-all.c8
3 files changed, 8 insertions, 12 deletions
diff --git a/accel/stubs/tcg-stub.c b/accel/stubs/tcg-stub.c
index a9e7a2d..8a496a2 100644
--- a/accel/stubs/tcg-stub.c
+++ b/accel/stubs/tcg-stub.c
@@ -22,10 +22,6 @@ void tlb_set_dirty(CPUState *cpu, vaddr vaddr)
{
}
-void tcg_flush_jmp_cache(CPUState *cpu)
-{
-}
-
int probe_access_flags(CPUArchState *env, vaddr addr, int size,
MMUAccessType access_type, int mmu_idx,
bool nonfault, void **phost, uintptr_t retaddr)
diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c
index 7ddb05c..1b57290 100644
--- a/accel/tcg/tcg-accel-ops.c
+++ b/accel/tcg/tcg-accel-ops.c
@@ -78,6 +78,13 @@ int tcg_cpus_exec(CPUState *cpu)
return ret;
}
+static void tcg_cpu_reset_hold(CPUState *cpu)
+{
+ tcg_flush_jmp_cache(cpu);
+
+ tlb_flush(cpu);
+}
+
/* mask must never be zero, except for A20 change call */
void tcg_handle_interrupt(CPUState *cpu, int mask)
{
@@ -206,6 +213,7 @@ static void tcg_accel_ops_init(AccelOpsClass *ops)
}
}
+ ops->cpu_reset_hold = tcg_cpu_reset_hold;
ops->supports_guest_debug = tcg_supports_guest_debug;
ops->insert_breakpoint = tcg_insert_breakpoint;
ops->remove_breakpoint = tcg_remove_breakpoint;
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index e579b08..b263857 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -673,11 +673,3 @@ void tcg_flush_jmp_cache(CPUState *cpu)
qatomic_set(&jc->array[i].tb, NULL);
}
}
-
-/* This is a wrapper for common code that can not use CONFIG_SOFTMMU */
-void tcg_flush_softmmu_tlb(CPUState *cs)
-{
-#ifdef CONFIG_SOFTMMU
- tlb_flush(cs);
-#endif
-}