From patchwork Tue Jun 15 21:03:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 55798 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 48577B7D8C for ; Wed, 16 Jun 2010 07:04:49 +1000 (EST) Received: from localhost ([127.0.0.1]:60019 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOdJM-0005Ua-GI for incoming@patchwork.ozlabs.org; Tue, 15 Jun 2010 17:04:44 -0400 Received: from [140.186.70.92] (port=42338 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOdIj-0005Ql-Sm for qemu-devel@nongnu.org; Tue, 15 Jun 2010 17:04:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OOdIh-0006BT-TN for qemu-devel@nongnu.org; Tue, 15 Jun 2010 17:04:05 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:62668) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OOdIh-00063a-Ie for qemu-devel@nongnu.org; Tue, 15 Jun 2010 17:04:03 -0400 Received: from flocke.weilnetz.de (p54ADF307.dip.t-dialin.net [84.173.243.7]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0M6xID-1P9TFo1rnh-00x5Cc; Tue, 15 Jun 2010 23:03:33 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.72) (envelope-from ) id 1OOdIC-0001uU-Bm; Tue, 15 Jun 2010 23:03:32 +0200 From: Stefan Weil To: QEMU Developers Date: Tue, 15 Jun 2010 23:03:28 +0200 Message-Id: <1276635808-7315-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.1 X-Provags-ID: V01U2FsdGVkX1/pjaLSwWDtrwstzzpQ90AmjVZstiW/U3civRB bLyNEuq1F1QYEmAPPa19bgU1fO12CyYmB64AulTjHPrmv/hzJ4 GU6EP/Ei8PgTsHk/4IGw4ZL/r2HIpMlS0snBpDxh2LlK3tE+LF cMg== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Anthony Liguori , Gleb Natapov Subject: [Qemu-devel] [PATCH] Fix comparison which always returned false 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 Comparing an 8 bit value with ~0 does not work as expected. Replace ~0 by UINT8_MAX in comparison and also in assignment (and fix coding style, too). Cc: Gleb Natapov Cc: Anthony Liguori Signed-off-by: Stefan Weil --- hw/hpet.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/hpet.c b/hw/hpet.c index 0c80ee5..d5c406c 100644 --- a/hw/hpet.c +++ b/hw/hpet.c @@ -74,7 +74,7 @@ typedef struct HPETState { uint8_t hpet_id; /* instance id */ } HPETState; -struct hpet_fw_config hpet_cfg = {.count = ~0}; +struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX}; static uint32_t hpet_in_legacy_mode(HPETState *s) { @@ -682,8 +682,10 @@ static int hpet_init(SysBusDevice *dev) int i, iomemtype; HPETTimer *timer; - if (hpet_cfg.count == ~0) /* first instance */ + if (hpet_cfg.count == UINT8_MAX) { + /* first instance */ hpet_cfg.count = 0; + } if (hpet_cfg.count == 8) { fprintf(stderr, "Only 8 instances of HPET is allowed\n");