OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/timer/hpet: Fix debug format strings 

Fix compiler errors when compiling with -DHPET_DEBUG due to mismatch
between format string token "%x" and the argument type uint64_t.

Also "%#x" is replaced by "0x%" PRIx64 according to the coding style.

Signed-off-by: Dov Murik <dovmurik@linux.vnet.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200909083650.46771-3-dovmurik@linux.vnet.ibm.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Dov Murik 2020-09-09 08:36:50 +00:00 committed by Laurent Vivier
parent d6892f12a5
commit 931c1d48e5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/timer/hpet.c
View File

@ -498,7 +498,8 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
HPETState *s = opaque; HPETState *s = opaque;
uint64_t old_val, new_val, val, index; uint64_t old_val, new_val, val, index;
DPRINTF("qemu: Enter hpet_ram_writel at %" PRIx64 " = %#x\n", addr, value); DPRINTF("qemu: Enter hpet_ram_writel at %" PRIx64 " = 0x%" PRIx64 "\n",
addr, value);
index = addr; index = addr;
old_val = hpet_ram_read(opaque, addr, 4); old_val = hpet_ram_read(opaque, addr, 4);
new_val = value; new_val = value;
@ -508,7 +509,7 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
uint8_t timer_id = (addr - 0x100) / 0x20; uint8_t timer_id = (addr - 0x100) / 0x20;
HPETTimer *timer = &s->timer[timer_id]; HPETTimer *timer = &s->timer[timer_id];
DPRINTF("qemu: hpet_ram_writel timer_id = %#x\n", timer_id); DPRINTF("qemu: hpet_ram_writel timer_id = 0x%x\n", timer_id);
if (timer_id > s->num_timers) { if (timer_id > s->num_timers) {
DPRINTF("qemu: timer id out of range\n"); DPRINTF("qemu: timer id out of range\n");
return; return;
@ -640,8 +641,8 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
} }
s->hpet_counter = s->hpet_counter =
(s->hpet_counter & 0xffffffff00000000ULL) | value; (s->hpet_counter & 0xffffffff00000000ULL) | value;
DPRINTF("qemu: HPET counter written. ctr = %#x -> %" PRIx64 "\n", DPRINTF("qemu: HPET counter written. ctr = 0x%" PRIx64 " -> "
value, s->hpet_counter); "%" PRIx64 "\n", value, s->hpet_counter);
break; break;
case HPET_COUNTER + 4: case HPET_COUNTER + 4:
if (hpet_enabled(s)) { if (hpet_enabled(s)) {
@ -649,8 +650,8 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
} }
s->hpet_counter = s->hpet_counter =
(s->hpet_counter & 0xffffffffULL) | (((uint64_t)value) << 32); (s->hpet_counter & 0xffffffffULL) | (((uint64_t)value) << 32);
DPRINTF("qemu: HPET counter + 4 written. ctr = %#x -> %" PRIx64 "\n", DPRINTF("qemu: HPET counter + 4 written. ctr = 0x%" PRIx64 " -> "
value, s->hpet_counter); "%" PRIx64 "\n", value, s->hpet_counter);
break; break;
default: default:
DPRINTF("qemu: invalid hpet_ram_writel\n"); DPRINTF("qemu: invalid hpet_ram_writel\n");