diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-05-10 06:38:21 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-06-01 17:08:17 +0200 |
| commit | 317c9d54284844615b33a25834a63248bf1bfa73 (patch) | |
| tree | e2b70541e870aaf9990db72050472ec3a7fc74fb /vl-android.c | |
| parent | 47dc1f4132ed3bafd2f564458288f9931ef0e0a4 (diff) | |
| download | external_qemu-317c9d54284844615b33a25834a63248bf1bfa73.zip external_qemu-317c9d54284844615b33a25834a63248bf1bfa73.tar.gz external_qemu-317c9d54284844615b33a25834a63248bf1bfa73.tar.bz2 | |
qemu-timer.c: upstream integrate
Change-Id: I6856ded73b4dcd10fe4831697c8518f958aeffbb
Diffstat (limited to 'vl-android.c')
| -rw-r--r-- | vl-android.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vl-android.c b/vl-android.c index b21600d..9f7e65c 100644 --- a/vl-android.c +++ b/vl-android.c @@ -3041,7 +3041,7 @@ static int qemu_cpu_exec(CPUState *env) qemu_icount -= (env->icount_decr.u16.low + env->icount_extra); env->icount_decr.u16.low = 0; env->icount_extra = 0; - count = qemu_next_deadline(); + count = qemu_next_icount_deadline(); count = (count + (1 << icount_time_shift) - 1) >> icount_time_shift; qemu_icount += count; |