Le 03/09/2020 à 15:45, Philippe Mathieu-Daudé a écrit :
> Fix building with HPET_DEBUG enabled:
>
> hw/timer/hpet.c:512:73: error: format specifies type 'unsigned int' but the
> argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat]
> DPRINTF("qemu: Enter hpet_ram_writel at %" PRIx64 " = %#x\n", addr,
> value);
> ~~~
> ^~~~~
> %#lx
> hw/timer/hpet.c:655:21: error: format specifies type 'unsigned int' but the
> argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat]
> value, s->hpet_counter);
> ^~~~~
>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> Keep trace-events conversion as ByteSizeTask.
> ---
> hw/timer/hpet.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
> index b683f64f1d3..8115e42cff3 100644
> --- a/hw/timer/hpet.c
> +++ b/hw/timer/hpet.c
> @@ -495,7 +495,7 @@ 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 0x%" HWADDR_PRIx " =
> 0x%#"PRIx64"\n", addr, value);
> index = addr;
> old_val = hpet_ram_read(opaque, addr, 4);
> new_val = value;
> @@ -637,7 +637,7 @@ 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",
> + DPRINTF("qemu: HPET counter written. ctr = %#" PRIx64 " -> %"
> PRIx64 "\n",
> value, s->hpet_counter);
> break;
> case HPET_COUNTER + 4:
> @@ -646,7 +646,7 @@ 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",
> + DPRINTF("qemu: HPET counter + 4 written. ctr = %#" PRIx64 " ->
> %" PRIx64 "\n",
> value, s->hpet_counter);
> break;
> default:
>
Applied to my trivial-patches branch.
Thanks,
Laurent
