From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NpJJq-0008LM-L4 for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:14 -0500 Received: from [199.232.76.173] (port=52789 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJJp-0008Jz-GV for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:13 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NpJJo-0004v3-Sj for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:13 -0500 Received: from ey-out-1920.google.com ([74.125.78.148]:44402) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NpJJn-0004t4-Uj for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:12 -0500 Received: by ey-out-1920.google.com with SMTP id 5so4373200eyb.14 for ; Wed, 10 Mar 2010 02:39:11 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 10 Mar 2010 11:38:50 +0100 Message-Id: <1268217535-26554-14-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 13/18] add qemu_alarm_pending 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 | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index 2f78817..18bd2ee 100644 --- a/vl.c +++ b/vl.c @@ -601,6 +601,13 @@ struct qemu_alarm_timer { char pending; }; +static struct qemu_alarm_timer *alarm_timer; + +static inline int qemu_alarm_pending(void) +{ + return alarm_timer->pending; +} + static inline int alarm_has_dynticks(struct qemu_alarm_timer *t) { return !!t->rearm; @@ -617,8 +624,6 @@ static void qemu_rearm_alarm_timer(struct qemu_alarm_timer *t) /* TODO: MIN_TIMER_REARM_US should be optimized */ #define MIN_TIMER_REARM_US 250 -static struct qemu_alarm_timer *alarm_timer; - #ifdef _WIN32 struct qemu_alarm_win32 { @@ -4000,7 +4005,7 @@ static void tcg_cpu_exec(void) qemu_clock_enable(vm_clock, (cur_cpu->singlestep_enabled & SSTEP_NOTIMER) == 0); - if (alarm_timer->pending) + if (qemu_alarm_pending()) break; if (cpu_can_run(env)) ret = qemu_cpu_exec(env); -- 1.6.6