hw/timer/mt48t59: Fix bit-rotten NVRAM_PRINTF format strings
commit54be4c42b2796ca6054cd1539d3ad4486447c789
authorThomas Huth <thuth@redhat.com>
Fri, 2 Feb 2018 08:15:31 +0000 (2 09:15 +0100)
committerMichael Tokarev <mjt@tls.msk.ru>
Sun, 20 May 2018 05:50:16 +0000 (20 08:50 +0300)
tree9bc5f0562e4c845673d5f731fb5b4b2464ff7f4f
parent4a4ff4c58fd750cde01c8b15d30d038cefc90a42
hw/timer/mt48t59: Fix bit-rotten NVRAM_PRINTF format strings

When compiling with NVRAM_PRINTF enabled, gcc currently bails out with:

  CC      hw/timer/m48t59.o
  CC      hw/timer/m48t59-isa.o
hw/timer/m48t59.c: In function ‘NVRAM_writeb’:
hw/timer/m48t59.c:460:5: error: format ‘%x’ expects argument of type ‘unsigned int’, but argument 3 has type ‘hwaddr’ [-Werror=format=]
     NVRAM_PRINTF("%s: 0x%08x => 0x%08x\n", __func__, addr, val);
     ^
hw/timer/m48t59.c:460:5: error: format ‘%x’ expects argument of type ‘unsigned int’, but argument 4 has type ‘uint64_t’ [-Werror=format=]
hw/timer/m48t59.c: In function ‘NVRAM_readb’:
hw/timer/m48t59.c:492:5: error: format ‘%x’ expects argument of type ‘unsigned int’, but argument 3 has type ‘hwaddr’ [-Werror=format=]
     NVRAM_PRINTF("%s: 0x%08x <= 0x%08x\n", __func__, addr, retval);

Fix it by using the correct format strings and while we're at it,
also change the definition of NVRAM_PRINTF so that this can not
bit-rot so easily again.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
hw/timer/m48t59-internal.h
hw/timer/m48t59.c