From patchwork Mon Dec 21 08:09:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 41521 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2B1C7B6F0E for ; Mon, 21 Dec 2009 19:41:58 +1100 (EST) Received: from localhost ([127.0.0.1]:43206 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMdpA-0003b3-W7 for incoming@patchwork.ozlabs.org; Mon, 21 Dec 2009 03:41:05 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NMdKs-0002jp-Mt for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:47 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NMdKk-0002gb-UL for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:43 -0500 Received: from [199.232.76.173] (port=52812 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMdKj-0002gA-3e for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44733) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NMdKi-0003nq-L1 for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:36 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBL89aLG003648 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 21 Dec 2009 03:09:36 -0500 Received: from localhost.localdomain (vpn2-10-119.ams2.redhat.com [10.36.10.119]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBL89V3O011460 for ; Mon, 21 Dec 2009 03:09:35 -0500 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Dec 2009 09:09:15 +0100 Message-Id: <1261382970-23251-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1261382970-23251-1-git-send-email-pbonzini@redhat.com> References: <1261382970-23251-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 04/19] fix error in win32_rearm_timer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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 22ec53d..58e57c1 100644 --- a/vl.c +++ b/vl.c @@ -1598,7 +1598,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",