From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLsj5-0002br-H0 for qemu-devel@nongnu.org; Fri, 16 Jun 2017 10:59:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLsj4-0008GY-JC for qemu-devel@nongnu.org; Fri, 16 Jun 2017 10:59:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1780) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dLsj4-0008GJ-D0 for qemu-devel@nongnu.org; Fri, 16 Jun 2017 10:59:54 -0400 From: Thomas Huth Date: Fri, 16 Jun 2017 16:59:11 +0200 Message-Id: <1497625153-19812-6-git-send-email-thuth@redhat.com> In-Reply-To: <1497625153-19812-1-git-send-email-thuth@redhat.com> References: <1497625153-19812-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH 5/7] cpu: Introduce a wrapper for tlb_flush() that can be used in common code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Paolo Bonzini Cc: Eduardo Habkost , =?UTF-8?q?Alex=20Benn=C3=A9e?= Commit 1f5c00cfdb8114c ("qom/cpu: move tlb_flush to cpu_common_reset") moved the call to tlb_flush() from the target-specific reset handlers into the common code qom/cpu.c file, and protected the call with "#ifdef CONFIG_SOFTMMU" to avoid that it is called for linux-user only targets. But since qom/cpu.c is common code, CONFIG_SOFTMMU is *never* defined here, so the tlb_flush() was simply never executed anymore. Fix it by introducing a wrapper for tlb_flush() in a file that is re-compiled for each target, i.e. in translate-all.c. Fixes: 1f5c00cfdb8114c1e3a13426588ceb64f82c9ddb Signed-off-by: Thomas Huth --- include/exec/cpu-common.h | 2 ++ qom/cpu.c | 5 ++--- translate-all.c | 8 ++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 4d45a72..74341b1 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -28,6 +28,8 @@ void qemu_init_cpu_list(void); void cpu_list_lock(void); void cpu_list_unlock(void); +void tcg_flush_softmmu_tlb(CPUState *cs); + #if !defined(CONFIG_USER_ONLY) enum device_endian { diff --git a/qom/cpu.c b/qom/cpu.c index 5069876..303eb42 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -26,6 +26,7 @@ #include "qemu/notify.h" #include "qemu/log.h" #include "exec/log.h" +#include "exec/cpu-common.h" #include "qemu/error-report.h" #include "sysemu/sysemu.h" #include "hw/qdev-properties.h" @@ -296,9 +297,7 @@ static void cpu_common_reset(CPUState *cpu) atomic_set(&cpu->tb_jmp_cache[i], NULL); } -#ifdef CONFIG_SOFTMMU - tlb_flush(cpu, 0); -#endif + tcg_flush_softmmu_tlb(cpu); } } diff --git a/translate-all.c b/translate-all.c index b3ee876..a45480f 100644 --- a/translate-all.c +++ b/translate-all.c @@ -2219,3 +2219,11 @@ int page_unprotect(target_ulong address, uintptr_t pc) return 0; } #endif /* CONFIG_USER_ONLY */ + +/* 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 +} -- 1.8.3.1