Instead of testing specially next_cpu in host_alarm_handler, just do that in qemu_notify_event. The idea is, if we are not running (or not yet running) target CPU code, prepare things so that the execution loop is exited asap; just make that clear.
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- vl.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/vl.c b/vl.c index 11b1b70..23ba687 100644 --- a/vl.c +++ b/vl.c @@ -1095,13 +1095,6 @@ static void host_alarm_handler(int host_signum) qemu_get_clock(host_clock))) { qemu_notify_event(); t->expired = alarm_has_dynticks(t); - -#ifndef CONFIG_IOTHREAD - if (next_cpu) { - /* stop the currently executing cpu because a timer occured */ - cpu_exit(next_cpu); - } -#endif qemu_bh_schedule(t->bh); } } @@ -3719,6 +3712,9 @@ void qemu_notify_event(void) if (env) { cpu_exit(env); + } else if (next_cpu) { + /* stop the currently executing cpu because a timer occured */ + cpu_exit(next_cpu); } } -- 1.6.5.2