Patchwork [11/14] qemu-timer: simplify qemu_run_timers

login
register
mail settings
Submitter Stefan Hajnoczi
Date Sept. 23, 2012, 10 a.m.
Message ID <1348394420-28298-12-git-send-email-stefanha@gmail.com>
Download mbox | patch
Permalink /patch/186200/
State New
Headers show

Comments

Stefan Hajnoczi - Sept. 23, 2012, 10 a.m.
From: Paolo Bonzini <pbonzini@redhat.com>

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 |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Patch

diff --git a/qemu-timer.c b/qemu-timer.c
index c7a1551..908a103 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -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) */