Revert r5636 to fix icount on hosts w/o high-res clocks

Changeset r5636 changed the timers to run in the alarm callback.  The 
alarm callback can only be called as frequently as the host alarm timer 
fires.  For older Linux hosts and possibly non-Linux hosts, this can be 
as high as a 1ms granularity.

icount calculates the select timeout based on the next deadline and 
select is usually capable of sleeping for a short period of time than 
alarm timer granularity.  This means that changing the timer callbacks 
to be based on alarm firing caused timers to fire much later than they 
ought to when using icount.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5796 c046a42c-6fe2-441c-8c8c-71466251a162

1 files changed, 9 insertions, 9 deletions

diff --git a/vl.c b/vl.c
index ef531df0cb..e4edf20a72 100644
--- a/vl.c
+++ b/vl.c
@@ -1624,15 +1624,6 @@ static void try_to_rearm_timer(void *opaque)
     } while ((len == -1 && errno == EINTR) || len > 0);
 #endif
 
-    /* vm time timers */
-    if (vm_running && likely(!(cur_cpu->singlestep_enabled & SSTEP_NOTIMER)))
-        qemu_run_timers(&active_timers[QEMU_TIMER_VIRTUAL],
-                        qemu_get_clock(vm_clock));
-
-    /* real time timers */
-    qemu_run_timers(&active_timers[QEMU_TIMER_REALTIME],
-                    qemu_get_clock(rt_clock));
-
     if (t->flags & ALARM_FLAG_EXPIRED) {
         alarm_timer->flags &= ~ALARM_FLAG_EXPIRED;
         qemu_rearm_alarm_timer(alarm_timer);
@@ -3629,6 +3620,15 @@ void main_loop_wait(int timeout)
     }
 #endif
 
+    /* vm time timers */
+    if (vm_running && likely(!(cur_cpu->singlestep_enabled & SSTEP_NOTIMER)))
+        qemu_run_timers(&active_timers[QEMU_TIMER_VIRTUAL],
+                        qemu_get_clock(vm_clock));
+
+    /* real time timers */
+    qemu_run_timers(&active_timers[QEMU_TIMER_REALTIME],
+                    qemu_get_clock(rt_clock));
+
     /* Check bottom-halves last in case any of the earlier events triggered
        them.  */
     qemu_bh_poll();