From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 10 Mar 2010 10:38:39 +0000 (+0100)
Subject: fix error in win32_rearm_timer
X-Git-Tag: v0.13.0-rc0~1069
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=291defbcda4dbcd3d7bfdd800c395cff66bd9faf;p=thirdparty%2Fqemu.git

fix error in win32_rearm_timer

The TIME_ONESHOT and TIME_PERIODIC flags are mutually exclusive.
The code after the patch matches the flags used in win32_start_timer.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/vl.c b/vl.c
index a9c6b1da4ea..df5c21c7ace 100644
--- a/vl.c
+++ b/vl.c
@@ -1408,7 +1408,7 @@ static void win32_rearm_timer(struct qemu_alarm_timer *t)
                         data->period,
                         host_alarm_handler,
                         (DWORD)t,
-                        TIME_ONESHOT | TIME_PERIODIC);
+                        TIME_ONESHOT | TIME_CALLBACK_FUNCTION);
 
     if (!data->timerId) {
         fprintf(stderr, "Failed to re-arm win32 alarm timer %ld\n",