commit 65269192241104342e3b1ba2b7b0f50e5042052e
author Philippe Mathieu-Daudé <f4bug@amsat.org> Sun Jan 17 17:48:12 2021 +0100
committer Richard Henderson <richard.henderson@linaro.org> Sat Jan 23 12:13:00 2021 -1000
tree 24bbf5db36a64fcb807fb9c2d1c2a065eaadee71
parent ee64036a4bec9fe79919812beddcf1a5f51f6bf6

accel/tcg: Restrict cpu_io_recompile() from other accelerators

As cpu_io_recompile() is only called within TCG accelerator
in cputlb.c, declare it locally.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210117164813.4101761-6-f4bug@amsat.org>
[rth: Adjust vs changed tb_flush_jmp_cache patch.]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

accel/tcg/cputlb.c

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 0fa1643..7a69726 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -37,6 +37,7 @@
 #include "exec/translate-all.h"
 #include "trace/trace-root.h"
 #include "trace/mem.h"
+#include "internal.h"
 #ifdef CONFIG_PLUGIN
 #include "qemu/plugin-memory.h"
 #endif

accel/tcg/internal.h

diff --git a/accel/tcg/internal.h b/accel/tcg/internal.h
index 06b341f..e9c145e 100644
--- a/accel/tcg/internal.h
+++ b/accel/tcg/internal.h
@@ -15,4 +15,6 @@
                               target_ulong cs_base, uint32_t flags,
                               int cflags);
 
+void QEMU_NORETURN cpu_io_recompile(CPUState *cpu, uintptr_t retaddr);
+
 #endif /* ACCEL_TCG_INTERNAL_H */

include/exec/exec-all.h

diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 3acc7c2..125000b 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -63,7 +63,6 @@
 bool cpu_restore_state(CPUState *cpu, uintptr_t searched_pc, bool will_exit);
 
 void QEMU_NORETURN cpu_loop_exit_noexc(CPUState *cpu);
-void QEMU_NORETURN cpu_io_recompile(CPUState *cpu, uintptr_t retaddr);
 void QEMU_NORETURN cpu_loop_exit(CPUState *cpu);
 void QEMU_NORETURN cpu_loop_exit_restore(CPUState *cpu, uintptr_t pc);
 void QEMU_NORETURN cpu_loop_exit_atomic(CPUState *cpu, uintptr_t pc);