Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20170331' into staging

[mirror_qemu.git] / cpu-exec-common.c

diff --git a/cpu-exec-common.c b/cpu-exec-common.c
index 0504a9457b38b67d532f1a2c32e2f04c9bf4d648..e81da276bb0cd78ab2c655f60e7a6001ab8161fd 100644 (file)
--- a/cpu-exec-common.c
+++ b/cpu-exec-common.c
@@ -35,7 +35,7 @@ void cpu_loop_exit_noexc(CPUState *cpu)
 #if defined(CONFIG_SOFTMMU)
 void cpu_reloading_memory_map(void)
 {
-    if (qemu_in_vcpu_thread()) {
+    if (qemu_in_vcpu_thread() && current_cpu->running) {
         /* The guest can in theory prolong the RCU critical section as long
          * as it feels like. The major problem with this is that because it
          * can do multiple reconfigurations of the memory map within the