Re: [Qemu-devel] [PATCH] qemu-timer: simplify qemu_run_timers

2012-09-22 Thread Stefan Hajnoczi
On Wed, Sep 19, 2012 at 03:52:44PM +0200, Paolo Bonzini wrote:
 ptimer_head is an invariant pointer to clock-active_timers.
 Remove it, and just reference clock-active_timers directly.
 
 Signed-off-by: Paolo Bonzini pbonz...@redhat.com
 ---
  qemu-timer.c | 7 +++
  1 file modificato, 3 inserzioni(+), 4 rimozioni(-)

qemu_run_timers() is a piece of code that I always have to read
line-by-line.  This simplification helps a bit, nice.

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan



[Qemu-devel] [PATCH] qemu-timer: simplify qemu_run_timers

2012-09-19 Thread Paolo Bonzini
ptimer_head is an invariant pointer to clock-active_timers.
Remove it, and just reference clock-active_timers directly.

Signed-off-by: Paolo Bonzini pbonz...@redhat.com
---
 qemu-timer.c | 7 +++
 1 file modificato, 3 inserzioni(+), 4 rimozioni(-)

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) */
-- 
1.7.12