From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NpJJl-0008GO-7e for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:09 -0500 Received: from [199.232.76.173] (port=52776 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJJk-0008Fh-7o for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:08 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NpJJi-0004th-Oi for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:07 -0500 Received: from mail-ew0-f225.google.com ([209.85.219.225]:62503) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NpJJi-0004sG-Bt for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:06 -0500 Received: by mail-ew0-f225.google.com with SMTP id 25so153293ewy.16 for ; Wed, 10 Mar 2010 02:39:05 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 10 Mar 2010 11:38:44 +0100 Message-Id: <1268217535-26554-8-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 07/18] remove qemu_rearm_alarm_timer from main loop List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Make the timer subsystem register its own callback instead. Signed-off-by: Paolo Bonzini --- vl.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/vl.c b/vl.c index 1328979..d6bbdbe 100644 --- a/vl.c +++ b/vl.c @@ -1417,6 +1417,12 @@ static void win32_rearm_timer(struct qemu_alarm_timer *t) #endif /* _WIN32 */ +static void alarm_timer_on_change_state_rearm(void *opaque, int running, int reason) +{ + if (running) + qemu_rearm_alarm_timer((struct qemu_alarm_timer *) opaque); +} + static int init_timer_alarm(void) { struct qemu_alarm_timer *t = NULL; @@ -1438,6 +1444,7 @@ static int init_timer_alarm(void) /* first event is at time 0 */ t->pending = 1; alarm_timer = t; + qemu_add_vm_change_state_handler(alarm_timer_on_change_state_rearm, t); return 0; @@ -3080,7 +3087,6 @@ void vm_start(void) cpu_enable_ticks(); vm_running = 1; vm_state_notify(1, 0); - qemu_rearm_alarm_timer(alarm_timer); resume_all_vcpus(); } } -- 1.6.6