From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 19 Mar 2010 10:30:35 +0000 (+0100)
Subject: fix race between timer firing vs. alarm_timer->pending = 0
X-Git-Tag: v0.13.0-rc0~957
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca5a2a4b12bd44762a5106c9352eafd878bbd52f;p=thirdparty%2Fqemu.git

fix race between timer firing vs. alarm_timer->pending = 0

The period for Win32 timers is very short and always the same
independent of dynticks, so it's possible that the timer fires
before qemu_run_all_timers has reset alarm_timer->pending to zero.
Reset alarm_timer->pending before rearming.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/qemu-timer.c b/qemu-timer.c
index 329d3a4e60f..49eac86c582 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -706,14 +706,14 @@ void configure_icount(const char *option)
 
 void qemu_run_all_timers(void)
 {
+    alarm_timer->pending = 0;
+
     /* rearm timer, if not periodic */
     if (alarm_timer->expired) {
         alarm_timer->expired = 0;
         qemu_rearm_alarm_timer(alarm_timer);
     }
 
-    alarm_timer->pending = 0;
-
     /* vm time timers */
     if (vm_running) {
         qemu_run_timers(vm_clock);