Message ID | 20170403124524.10824-6-alex.bennee@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | MTTCG and record/replay fixes for rc3 | expand |
On 04/03/2017 05:45 AM, Alex Bennée wrote: > 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> > --- > cpus.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Richard Henderson <rth@twiddle.net> r~
diff --git a/cpus.c b/cpus.c index 68fdbc40b9..4e48b9c4ad 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); }
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> --- cpus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.11.0