diff options
| author | Emilio G. Cota | 2019-01-15 20:47:54 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2019-02-05 16:50:16 +0100 |
| commit | 6aaa24f9d494a46c0a5aa5c7202cf50b3a7075ef (patch) | |
| tree | 4a46a4071a04a258de35937f9083be04a0b25a23 | |
| parent | cpu-exec: add assert_no_pages_locked() after longjmp (diff) | |
| download | qemu-6aaa24f9d494a46c0a5aa5c7202cf50b3a7075ef.tar.gz qemu-6aaa24f9d494a46c0a5aa5c7202cf50b3a7075ef.tar.xz qemu-6aaa24f9d494a46c0a5aa5c7202cf50b3a7075ef.zip | |
cpu-exec: reset BQL after longjmp in cpu_exec_step_atomic
Just like we do in cpu_exec().
Reported-by: Max Filippov <jcmvbkbc@gmail.com>
Tested-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Emilio G. Cota <cota@braap.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | accel/tcg/cpu-exec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 49b3259f36..fab30af86f 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -266,6 +266,9 @@ void cpu_exec_step_atomic(CPUState *cpu) #ifndef CONFIG_SOFTMMU tcg_debug_assert(!have_mmap_lock()); #endif + if (qemu_mutex_iothread_locked()) { + qemu_mutex_unlock_iothread(); + } assert_no_pages_locked(); } |