mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

accel/tcg: Check for USER_ONLY definition instead of SOFTMMU one

Browse Source 
Since we *might* have user emulation with softmmu,
replace the system emulation check by !user emulation one.

Invert some if() ladders for clarity.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230613133347.82210-7-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-06-13 15:33:44 +02:00 committed by Richard Henderson
parent 75fe97b429
commit 905db98a73
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accel/tcg/cpu-exec.c
View File

@ -566,7 +566,7 @@ void cpu_exec_step_atomic(CPUState *cpu)
cpu_tb_exec(cpu, tb, &tb_exit); cpu_tb_exec(cpu, tb, &tb_exit);
cpu_exec_exit(cpu); cpu_exec_exit(cpu);
} else { } else {
#ifndef CONFIG_SOFTMMU #ifdef CONFIG_USER_ONLY
clear_helper_retaddr(); clear_helper_retaddr();
if (have_mmap_lock()) { if (have_mmap_lock()) {
mmap_unlock(); mmap_unlock();
@ -1023,7 +1023,7 @@ static int cpu_exec_setjmp(CPUState *cpu, SyncClocks *sc)
/* Non-buggy compilers preserve this; assert the correct value. */ /* Non-buggy compilers preserve this; assert the correct value. */
g_assert(cpu == current_cpu); g_assert(cpu == current_cpu);
#ifndef CONFIG_SOFTMMU #ifdef CONFIG_USER_ONLY
clear_helper_retaddr(); clear_helper_retaddr();
if (have_mmap_lock()) { if (have_mmap_lock()) {
mmap_unlock(); mmap_unlock();

6
accel/tcg/internal.h
View File

@ -17,10 +17,10 @@
* memory related structures are protected with mmap_lock. * memory related structures are protected with mmap_lock.
* In !user-mode we use per-page locks. * In !user-mode we use per-page locks.
*/ */
#ifdef CONFIG_SOFTMMU #ifdef CONFIG_USER_ONLY
#define assert_memory_lock()
#else
#define assert_memory_lock() tcg_debug_assert(have_mmap_lock()) #define assert_memory_lock() tcg_debug_assert(have_mmap_lock())
#else
#define assert_memory_lock()
#endif #endif
#if defined(CONFIG_SOFTMMU) && defined(CONFIG_DEBUG_TCG) #if defined(CONFIG_SOFTMMU) && defined(CONFIG_DEBUG_TCG)