]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
qemu-timer: simplify qemu_run_timers
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 19 Sep 2012 13:52:44 +0000 (15:52 +0200)
committerStefan Hajnoczi <stefanha@gmail.com>
Sun, 23 Sep 2012 06:11:29 +0000 (07:11 +0100)
ptimer_head is an invariant pointer to clock->active_timers.
Remove it, and just reference clock->active_timers directly.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
qemu-timer.c

index c7a1551a3603db20b5ac08408a73d97a95c1f77b..908a1030b602248d5b18b407a87131e4385269b6 100644 (file)
@@ -372,21 +372,20 @@ bool qemu_timer_expired(QEMUTimer *timer_head, int64_t current_time)
 
 void qemu_run_timers(QEMUClock *clock)
 {
-    QEMUTimer **ptimer_head, *ts;
+    QEMUTimer *ts;
     int64_t current_time;
    
     if (!clock->enabled)
         return;
 
     current_time = qemu_get_clock_ns(clock);
-    ptimer_head = &clock->active_timers;
     for(;;) {
-        ts = *ptimer_head;
+        ts = clock->active_timers;
         if (!qemu_timer_expired_ns(ts, current_time)) {
             break;
         }
         /* remove timer from the list before calling the callback */
-        *ptimer_head = ts->next;
+        clock->active_timers = ts->next;
         ts->next = NULL;
 
         /* run the callback (the timer list can be modified) */