From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NpJJh-0008DM-AX for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:05 -0500 Received: from [199.232.76.173] (port=52766 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJJg-0008D0-LR for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:04 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NpJJf-0004sY-DA for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:04 -0500 Received: from mail-ew0-f225.google.com ([209.85.219.225]:62503) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NpJJe-0004sG-UE for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:03 -0500 Received: by ewy25 with SMTP id 25so153293ewy.16 for ; Wed, 10 Mar 2010 02:39:01 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 10 Mar 2010 11:38:38 +0100 Message-Id: <1268217535-26554-2-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 01/18] avoid dubiously clever code in win32_start_timer List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The code is initializing an unsigned int to UINT_MAX using "-1", so that the following always-true comparison seems to be always-false at a first look. Since alarm timer initializations are never nested, it is simpler to unconditionally store the result of timeGetDevCaps into data->period. Signed-off-by: Paolo Bonzini --- vl.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index d8328c7..6b1e1a7 100644 --- a/vl.c +++ b/vl.c @@ -626,7 +626,7 @@ static struct qemu_alarm_timer *alarm_timer; struct qemu_alarm_win32 { MMRESULT timerId; unsigned int period; -} alarm_win32_data = {0, -1}; +} alarm_win32_data = {0, 0}; static int win32_start_timer(struct qemu_alarm_timer *t); static void win32_stop_timer(struct qemu_alarm_timer *t); @@ -1360,9 +1360,7 @@ static int win32_start_timer(struct qemu_alarm_timer *t) memset(&tc, 0, sizeof(tc)); timeGetDevCaps(&tc, sizeof(tc)); - if (data->period < tc.wPeriodMin) - data->period = tc.wPeriodMin; - + data->period = tc.wPeriodMin; timeBeginPeriod(data->period); flags = TIME_CALLBACK_FUNCTION; -- 1.6.6