Patchwork [13/18] add qemu_alarm_pending

login
register
mail settings
Submitter Paolo Bonzini
Date March 10, 2010, 10:38 a.m.
Message ID <1268217535-26554-14-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/47239/
State New
Headers show

Comments

Paolo Bonzini - March 10, 2010, 10:38 a.m.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 vl.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

Patch

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);