[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/17] hw/timer/hpet: Fix debug format strings
From: |
Laurent Vivier |
Subject: |
[PULL 07/17] hw/timer/hpet: Fix debug format strings |
Date: |
Sat, 19 Sep 2020 20:44:41 +0200 |
From: Dov Murik <dovmurik@linux.vnet.ibm.com>
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>
---
hw/timer/hpet.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 07ff82b33358..edaa5a0adfb5 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");
--
2.26.2
- [PULL 00/17] Trivial branch for 5.2 patches, Laurent Vivier, 2020/09/19
- [PULL 03/17] ui/spice-input: Remove superfluous forward declaration, Laurent Vivier, 2020/09/19
- [PULL 02/17] hw/ppc/ppc4xx_pci: Replace magic value by the PCI_NUM_PINS definition, Laurent Vivier, 2020/09/19
- [PULL 01/17] hw/gpio/max7310: Remove impossible check, Laurent Vivier, 2020/09/19
- [PULL 04/17] manual: escape backslashes in "parsed-literal" blocks, Laurent Vivier, 2020/09/19
- [PULL 05/17] meson: remove empty else and duplicated gio deps, Laurent Vivier, 2020/09/19
- [PULL 06/17] hw/timer/hpet: Remove unused functions hpet_ram_readb, hpet_ram_readw, Laurent Vivier, 2020/09/19
- [PULL 08/17] scripts/git.orderfile: Display meson files along with buildsys ones, Laurent Vivier, 2020/09/19
- [PULL 07/17] hw/timer/hpet: Fix debug format strings,
Laurent Vivier <=
- [PULL 09/17] qemu/: fix some comment spelling errors, Laurent Vivier, 2020/09/19
- [PULL 13/17] util/: fix some comment spelling errors, Laurent Vivier, 2020/09/19
- [PULL 16/17] qapi/: fix some comment spelling errors, Laurent Vivier, 2020/09/19
- [PULL 12/17] scripts/: fix some comment spelling errors, Laurent Vivier, 2020/09/19
- [PULL 15/17] disas/: fix some comment spelling errors, Laurent Vivier, 2020/09/19
- [PULL 14/17] linux-user/: fix some comment spelling errors, Laurent Vivier, 2020/09/19
- [PULL 17/17] contrib/: fix some comment spelling errors, Laurent Vivier, 2020/09/19
- [PULL 10/17] migration/: fix some comment spelling errors, Laurent Vivier, 2020/09/19
- [PULL 11/17] docs/: fix some comment spelling errors, Laurent Vivier, 2020/09/19
- Re: [PULL 00/17] Trivial branch for 5.2 patches, no-reply, 2020/09/19