diff mbox series

[PULL,04/11] cpus: remove icount handling from qemu_tcg_cpu_thread_fn

Message ID 20170410125524.21008-5-alex.bennee@linaro.org
State Accepted
Commit bf51c7206facff628df24c5499ace9c97c503962
Headers show
Series Final icount and misc MTTCG fixes for 2.9 | expand

Commit Message

Alex Bennée April 10, 2017, 12:55 p.m. UTC 
We should never be running in multi-threaded mode with icount enabled.
There is no point calling handle_icount_deadline here so remove it and
assert !use_icount.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Richard Henderson <rth@twiddle.net>


-- 
2.11.0
diff mbox series

Patch

diff --git a/cpus.c b/cpus.c
index 58d90aa2b9..fc0ddc8793 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1392,6 +1392,8 @@  static void *qemu_tcg_cpu_thread_fn(void *arg)
 {
     CPUState *cpu = arg;
 
+    g_assert(!use_icount);
+
     rcu_register_thread();
 
     qemu_mutex_lock_iothread();
@@ -1434,8 +1436,6 @@  static void *qemu_tcg_cpu_thread_fn(void *arg)
             }
         }
 
-        handle_icount_deadline();
-
         atomic_mb_set(&cpu->exit_request, 0);
         qemu_tcg_wait_io_event(cpu);
     }