diff options
| author | David 'Digit' Turner <digit@android.com> | 2010-10-15 15:05:04 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2010-10-18 10:44:11 +0200 |
| commit | 6b512811e01d7c81348bfa9c29c21f788ccc0a8e (patch) | |
| tree | d87abe06cf3eaaa3ed9ff39e692f6497e6fb97b7 /vl-android.c | |
| parent | 3ba139cbc278f905bfb1c13f3b92fb88a1f2a36f (diff) | |
| download | external_qemu-6b512811e01d7c81348bfa9c29c21f788ccc0a8e.zip external_qemu-6b512811e01d7c81348bfa9c29c21f788ccc0a8e.tar.gz external_qemu-6b512811e01d7c81348bfa9c29c21f788ccc0a8e.tar.bz2 | |
Fix windows event loop handling.
This change fixes the windows emulator binary which got stuck
due to changes in the timer implementation that occured during
the last upstream integration.
Change-Id: I090ce4ac9c09b3b95e0df95513446922120b2d9a
Diffstat (limited to 'vl-android.c')
| -rw-r--r-- | vl-android.c | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/vl-android.c b/vl-android.c index fce438e..d353c31 100644 --- a/vl-android.c +++ b/vl-android.c @@ -313,7 +313,6 @@ uint64_t node_cpumask[MAX_NODES]; static CPUState *cur_cpu; static CPUState *next_cpu; -static int timer_alarm_pending = 1; static QEMUTimer *nographic_timer; uint8_t qemu_uuid[16]; @@ -3063,9 +3062,9 @@ void main_loop_wait(int timeout) } } - /* remove deleted IO handlers */ - pioh = &first_io_handler; - while (*pioh) { + /* remove deleted IO handlers */ + pioh = &first_io_handler; + while (*pioh) { ioh = *pioh; if (ioh->deleted) { *pioh = ioh->next; @@ -3086,27 +3085,6 @@ void main_loop_wait(int timeout) #endif charpipe_poll(); -#if 0 - /* rearm timer, if not periodic */ - if (alarm_timer->flags & ALARM_FLAG_EXPIRED) { - alarm_timer->flags &= ~ALARM_FLAG_EXPIRED; - qemu_rearm_alarm_timer(alarm_timer); - } - - /* vm time timers */ - if (vm_running) { - if (!cur_cpu || likely(!(cur_cpu->singlestep_enabled & SSTEP_NOTIMER))) - qemu_run_timers(&active_timers[QEMU_CLOCK_VIRTUAL], - qemu_get_clock(vm_clock)); - } - - /* real time timers */ - qemu_run_timers(&active_timers[QEMU_CLOCK_REALTIME], - qemu_get_clock(rt_clock)); - - qemu_run_timers(&active_timers[QEMU_CLOCK_HOST], - qemu_get_clock(host_clock)); -#endif qemu_run_all_timers(); /* Check bottom-halves last in case any of the earlier events triggered @@ -3175,8 +3153,7 @@ static void tcg_cpu_exec(void) if (!vm_running) break; - if (timer_alarm_pending) { - timer_alarm_pending = 0; + if (qemu_timer_alarm_pending()) { break; } if (cpu_can_run(env)) @@ -3189,7 +3166,6 @@ static void tcg_cpu_exec(void) } } -#if 0 static int cpu_has_work(CPUState *env) { if (env->stop) @@ -3203,7 +3179,7 @@ static int cpu_has_work(CPUState *env) return 0; } -static int tcg_has_work(void) +int tcg_has_work(void) { CPUState *env; @@ -3212,7 +3188,6 @@ static int tcg_has_work(void) return 1; return 0; } -#endif static int vm_can_run(void) { |