From: Emilio G. Cota <cota@braap.org>
Date: Tue, 15 Jan 2019 19:47:54 +0000 (-0500)
Subject: cpu-exec: reset BQL after longjmp in cpu_exec_step_atomic
X-Git-Tag: v4.0.0-rc0~114^2~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6aaa24f9d494a46c0a5aa5c7202cf50b3a7075ef;p=thirdparty%2Fqemu.git

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>
---

diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 49b3259f362..fab30af86f9 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();
     }