diff options
| author | Dov Murik | 2020-09-09 10:36:50 +0200 |
|---|---|---|
| committer | Laurent Vivier | 2020-09-16 11:14:29 +0200 |
| commit | 931c1d48e5e4a6c0a38476da49ed21ef6260fe45 (patch) | |
| tree | 130d3879313ff23d2a0f235877e4e6b53e7f05ab | |
| parent | hw/timer/hpet: Remove unused functions hpet_ram_readb, hpet_ram_readw (diff) | |
| download | qemu-931c1d48e5e4a6c0a38476da49ed21ef6260fe45.tar.gz qemu-931c1d48e5e4a6c0a38476da49ed21ef6260fe45.tar.xz qemu-931c1d48e5e4a6c0a38476da49ed21ef6260fe45.zip | |
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>
| -rw-r--r-- | hw/timer/hpet.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 07ff82b333..edaa5a0adf 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -498,7 +498,8 @@ static void hpet_ram_write(void *opaque, hwaddr addr, HPETState *s = opaque; 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; old_val = hpet_ram_read(opaque, addr, 4); new_val = value; @@ -508,7 +509,7 @@ static void hpet_ram_write(void *opaque, hwaddr addr, uint8_t timer_id = (addr - 0x100) / 0x20; 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) { DPRINTF("qemu: timer id out of range\n"); return; @@ -640,8 +641,8 @@ static void hpet_ram_write(void *opaque, hwaddr addr, } s->hpet_counter = (s->hpet_counter & 0xffffffff00000000ULL) | value; - DPRINTF("qemu: HPET counter written. ctr = %#x -> %" PRIx64 "\n", - value, s->hpet_counter); + DPRINTF("qemu: HPET counter written. ctr = 0x%" PRIx64 " -> " + "%" PRIx64 "\n", value, s->hpet_counter); break; case HPET_COUNTER + 4: if (hpet_enabled(s)) { @@ -649,8 +650,8 @@ static void hpet_ram_write(void *opaque, hwaddr addr, } s->hpet_counter = (s->hpet_counter & 0xffffffffULL) | (((uint64_t)value) << 32); - DPRINTF("qemu: HPET counter + 4 written. ctr = %#x -> %" PRIx64 "\n", - value, s->hpet_counter); + DPRINTF("qemu: HPET counter + 4 written. ctr = 0x%" PRIx64 " -> " + "%" PRIx64 "\n", value, s->hpet_counter); break; default: DPRINTF("qemu: invalid hpet_ram_writel\n"); |