From 72c8e4d26410cee97aadbc53b0baa19343795f4b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 13 Feb 2018 09:01:42 -0500 Subject: [PATCH] exec: move functions to translate-all.h Remove them from the sundry exec-all.h header, since they are only used by the TCG runtime in exec.c and user-exec.c. Backports commit 1652b974766401743879d78f796f44b8929b0787 from qemu --- qemu/include/exec/exec-all.h | 5 ----- qemu/translate-all.h | 8 ++++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/qemu/include/exec/exec-all.h b/qemu/include/exec/exec-all.h index 4750f444..cf64ad01 100644 --- a/qemu/include/exec/exec-all.h +++ b/qemu/include/exec/exec-all.h @@ -86,11 +86,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, void cpu_exec_init(CPUArchState *env, void *opaque); void QEMU_NORETURN cpu_loop_exit(CPUState *cpu); - -void tb_invalidate_phys_page_range(struct uc_struct *uc, tb_page_addr_t start, tb_page_addr_t end, - int is_cpu_write_access); -void tb_invalidate_phys_range(struct uc_struct *uc, tb_page_addr_t start, tb_page_addr_t end, - int is_cpu_write_access); #if !defined(CONFIG_USER_ONLY) void cpu_reload_memory_map(CPUState *cpu); void tcg_cpu_address_space_init(CPUState *cpu, AddressSpace *as); diff --git a/qemu/translate-all.h b/qemu/translate-all.h index 4317e526..90e245cb 100644 --- a/qemu/translate-all.h +++ b/qemu/translate-all.h @@ -22,6 +22,14 @@ /* translate-all.c */ void tb_check_watchpoint(CPUState *cpu); void tb_invalidate_phys_page_fast(struct uc_struct* uc, tb_page_addr_t start, int len); +void tb_invalidate_phys_page_range(struct uc_struct *uc, tb_page_addr_t start, tb_page_addr_t end, + int is_cpu_write_access); +void tb_invalidate_phys_range(struct uc_struct *uc, tb_page_addr_t start, tb_page_addr_t end, + int is_cpu_write_access); void tb_cleanup(struct uc_struct *uc); +#ifdef CONFIG_USER_ONLY +int page_unprotect(target_ulong address, uintptr_t pc, void *puc); +#endif + #endif /* TRANSLATE_ALL_H */