diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2017-03-30 18:32:29 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2017-04-10 10:14:50 +0100 |
| commit | bf51c7206facff628df24c5499ace9c97c503962 (patch) | |
| tree | 7ed5c356f18a524a17c443dc2949de171de80bcc | |
| parent | b4e79a502ff2ac06a21c45f598870de807eb5d20 (diff) | |
| download | focaccia-qemu-bf51c7206facff628df24c5499ace9c97c503962.tar.gz focaccia-qemu-bf51c7206facff628df24c5499ace9c97c503962.zip | |
cpus: remove icount handling from qemu_tcg_cpu_thread_fn
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>
| -rw-r--r-- | cpus.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |