From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NpJJp-0008Ju-Dd for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:13 -0500 Received: from [199.232.76.173] (port=52781 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJJl-0008Gg-MU for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:09 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NpJJk-0004uD-JC for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:09 -0500 Received: from mail-ew0-f225.google.com ([209.85.219.225]:37628) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NpJJk-0004sE-8S for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:08 -0500 Received: by mail-ew0-f225.google.com with SMTP id 25so153290ewy.16 for ; Wed, 10 Mar 2010 02:39:07 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 10 Mar 2010 11:38:46 +0100 Message-Id: <1268217535-26554-10-git-send-email-pbonzini@redhat.com> In-Reply-To: <1268217535-26554-1-git-send-email-pbonzini@redhat.com> References: <1268217535-26554-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 09/18] change qemu_run_timers interface List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- vl.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/vl.c b/vl.c index 3347ba0..2b9b379 100644 --- a/vl.c +++ b/vl.c @@ -903,10 +903,13 @@ int qemu_timer_expired(QEMUTimer *timer_head, int64_t current_time) return (timer_head->expire_time <= current_time); } -static void qemu_run_timers(QEMUTimer **ptimer_head, int64_t current_time) +static void qemu_run_timers(QEMUClock *clock) { - QEMUTimer *ts; + QEMUTimer **ptimer_head, *ts; + int64_t current_time; + current_time = qemu_get_clock (clock); + ptimer_head = &active_timers[clock->type]; for(;;) { ts = *ptimer_head; if (!ts || ts->expire_time > current_time) @@ -1015,16 +1018,11 @@ static void qemu_run_all_timers(void) /* vm time timers */ if (vm_running) { if (!cur_cpu || likely(!(cur_cpu->singlestep_enabled & SSTEP_NOTIMER))) - qemu_run_timers(&active_timers[QEMU_CLOCK_VIRTUAL], - qemu_get_clock(vm_clock)); + qemu_run_timers(vm_clock); } - /* real time timers */ - qemu_run_timers(&active_timers[QEMU_CLOCK_REALTIME], - qemu_get_clock(rt_clock)); - - qemu_run_timers(&active_timers[QEMU_CLOCK_HOST], - qemu_get_clock(host_clock)); + qemu_run_timers(rt_clock); + qemu_run_timers(host_clock); } #ifdef _WIN32 -- 1.6.6