From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NpJJj-0008F4-6S for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:07 -0500 Received: from [199.232.76.173] (port=52770 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJJh-0008DO-FF for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:05 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NpJJf-0004sX-Dq for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:04 -0500 Received: from mail-ew0-f225.google.com ([209.85.219.225]:37628) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NpJJe-0004sE-VH for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:03 -0500 Received: by mail-ew0-f225.google.com with SMTP id 25so153290ewy.16 for ; Wed, 10 Mar 2010 02:39:02 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 10 Mar 2010 11:38:39 +0100 Message-Id: <1268217535-26554-3-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 02/18] fix error in win32_rearm_timer List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- vl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/vl.c b/vl.c index 6b1e1a7..7958a26 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", -- 1.6.6