aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2010-06-15 23:03:28 +0200
committermalc <av1474@comtv.ru>2010-06-16 01:43:38 +0400
commitd2c5efd89fe319f150aba0b67e394f23f6c07ba6 (patch)
tree8978e24511aaca14272929cd791d49c772f22123 /hw
parent167e609af42c6bfc430c1c1b3f00d8c57276c7e6 (diff)
downloadqemu-d2c5efd89fe319f150aba0b67e394f23f6c07ba6.zip
qemu-d2c5efd89fe319f150aba0b67e394f23f6c07ba6.tar.gz
qemu-d2c5efd89fe319f150aba0b67e394f23f6c07ba6.tar.bz2
Fix comparison which always returned false
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 <gleb@redhat.com> Cc: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: malc <av1474@comtv.ru>
Diffstat (limited to 'hw')
-rw-r--r--hw/hpet.c6
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");