Move tb_lock()/tb_unlock()/tb_lock_reset() from tcg.h to translate-all.h. tb_lock()/tb_unlock() need be impelemnted in accel/stubs/tcg-stub.c.
Signed-off-by: Yang Zhong <[email protected]> --- accel/stubs/tcg-stub.c | 8 ++++++++ accel/tcg/cpu-exec.c | 1 + accel/tcg/cputlb.c | 1 + accel/tcg/translate-all.h | 3 +++ tcg/tcg.h | 4 ---- trace/control-target.c | 1 - 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/accel/stubs/tcg-stub.c b/accel/stubs/tcg-stub.c index 12c41dd..dafb1d0 100644 --- a/accel/stubs/tcg-stub.c +++ b/accel/stubs/tcg-stub.c @@ -19,6 +19,14 @@ #include "translate-all.h" #include "exec/cpu-all.h" +void tb_lock(void) +{ +} + +void tb_unlock(void) +{ +} + void tb_flush(CPUState *cpu) { } diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 3581618..03b4ea2 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -21,6 +21,7 @@ #include "trace.h" #include "disas/disas.h" #include "exec/exec-all.h" +#include "translate-all.h" #include "tcg.h" #include "qemu/atomic.h" #include "sysemu/qtest.h" diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 743776a..dcbea26 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -21,6 +21,7 @@ #include "qemu/main-loop.h" #include "cpu.h" #include "exec/exec-all.h" +#include "translate-all.h" #include "exec/memory.h" #include "exec/address-spaces.h" #include "exec/cpu_ldst.h" diff --git a/accel/tcg/translate-all.h b/accel/tcg/translate-all.h index ba8e4d6..4774f78 100644 --- a/accel/tcg/translate-all.h +++ b/accel/tcg/translate-all.h @@ -23,6 +23,9 @@ /* translate-all.c */ +void tb_lock(void); +void tb_unlock(void); +void tb_lock_reset(void); void tb_invalidate_phys_page_fast(tb_page_addr_t start, int len); void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, int is_cpu_write_access); diff --git a/tcg/tcg.h b/tcg/tcg.h index 5ec48d1..a5ff00c 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -757,10 +757,6 @@ static inline bool tcg_op_buf_full(void) void *tcg_malloc_internal(TCGContext *s, int size); void tcg_pool_reset(TCGContext *s); -void tb_lock(void); -void tb_unlock(void); -void tb_lock_reset(void); - /* Called with tb_lock held. */ static inline void *tcg_malloc(int size) { diff --git a/trace/control-target.c b/trace/control-target.c index 6266e63..2a5efc7 100644 --- a/trace/control-target.c +++ b/trace/control-target.c @@ -11,7 +11,6 @@ #include "cpu.h" #include "trace-root.h" #include "trace/control.h" -#include "translate-all.h" void trace_event_set_state_dynamic_init(TraceEvent *ev, bool state) -- 1.9.1
