From patchwork Wed Mar 10 10:38:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 47229 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 64F6EB7CB8 for ; Wed, 10 Mar 2010 21:55:35 +1100 (EST) Received: from localhost ([127.0.0.1]:57353 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJZc-0003bD-6k for incoming@patchwork.ozlabs.org; Wed, 10 Mar 2010 05:55:32 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:subject:date :message-id:x-mailer:in-reply-to:references; bh=QkPUeZqRGdhtu100OVp3zDEvHAPq1kSmCZOAkP4/ZBI=; b=JNt3flHQyCnxDtZ7SfNc9hE7THBCqOoHqd869m2cmD29r1crFLG3o3Cj9sP+fZIQ7M eix8hbe8vX/bM1UI48UguiYB+lcUCLgcrTSif85+ZQbWmMRg5zBuVpCr+IkCvrNUJAMv wtFP32JZWzJZPqx8SAg5Y3Ui6te7el1QwwFTE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=N26lzwxYETq14E5hMRhyNZXPOy+m1n/jJftmNAbL4800JaUGUCnjf69Ir3jO+FS9i3 wwoS+sedbpGkedKqfMuejn6gWEJR0SIe1qpYMdDsZqKxZmsijPPhBz4EKOOATwZdgsX+ MHcS684oBumVwcrTbx9irS+invwAwkA2nWzpE= Received: by 10.213.1.143 with SMTP id 15mr4954339ebf.55.1268217541205; Wed, 10 Mar 2010 02:39:01 -0800 (PST) Received: from localhost.localdomain (nat-pool-brq-t.redhat.com [209.132.186.34]) by mx.google.com with ESMTPS id 14sm3836002ewy.2.2010.03.10.02.39.00 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 10 Mar 2010 02:39:00 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 10 Mar 2010 11:38:38 +0100 Message-Id: <1268217535-26554-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1268217535-26554-1-git-send-email-pbonzini@redhat.com> References: <1268217535-26554-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 01/18] avoid dubiously clever code in win32_start_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 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;