]> git.proxmox.com Git - mirror_qemu.git/commitdiff
cpus: remove icount handling from qemu_tcg_cpu_thread_fn
authorAlex Bennée <alex.bennee@linaro.org>
Thu, 30 Mar 2017 17:32:29 +0000 (18:32 +0100)
committerAlex Bennée <alex.bennee@linaro.org>
Mon, 10 Apr 2017 09:14:50 +0000 (10:14 +0100)
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>
cpus.c

diff --git a/cpus.c b/cpus.c
index 58d90aa2b9e9572951d50b894204ac8dd1ca3019..fc0ddc87934ca2f76e5daeb0e9a9569db9f593ff 100644 (file)
--- 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);
     }