hw/timer/mt48t59: Fix bit-rotten NVRAM_PRINTF format strings
PATCH 1/1 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.ohw/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.
--- hw/timer/m48t59-internal.h | 9 +++------ hw/timer/m48t59.c | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-)
hw/timer/m48t59-internal.h +3 -6
@@ -25,13 +25,10 @@#ifndef HW_M48T59_INTERNAL_H #define HW_M48T59_INTERNAL_H 1 -//#define DEBUG_NVRAM +#define M48T59_DEBUG 0 -#if defined(DEBUG_NVRAM ) -#define NVRAM_PRINTF (fmt, ...) do { printf(fmt , ## __VA_ARGS__); } while (0) -#else -#define NVRAM_PRINTF (fmt, ...) do { } while (0) -#endif +#define NVRAM_PRINTF (fmt, ...) do { \ + if (M48T59_DEBUG) { printf(fmt , ## __VA_ARGS__); } } while (0)/* * The M48T02, M48T08 and M48T59 chips are very similar. The newer '59 has
hw/timer/m48t59.c +2 -2
@@ -457,7 +457,7 @@ static void NVRAM_writeb(void *opaque, hwaddr addr, uint64_t val, {M48t59State *NVRAM = opaque; -NVRAM_PRINTF ("%s: 0x%08x => 0x%08x\n" , __func__, addr, val); +NVRAM_PRINTF ("%s: 0x%" HWADDR_PRIx" => 0x%" PRIx64"\n" , __func__, addr, val);switch (addr) {case 0 :NVRAM ->addr &= ~0x00FF ;
@@ -489,7 +489,7 @@ static uint64_t NVRAM_readb(void *opaque, hwaddr addr, unsigned size) retval =-1 ;break ; } -NVRAM_PRINTF ("%s: 0x%08x <= 0x%08x\n" , __func__, addr, retval); +NVRAM_PRINTF ("%s: 0x%" HWADDR_PRIx" <= 0x%08x\n" , __func__, addr, retval);return retval; }
Signature · 1 line
1.8.3.1
Hi Thomas,
Quoted 31 lines · Thomas Huth
When compiling with
NVRAM_PRINTFenabled, gcc currently bails out with:CC
hw/timer/m48t59.o
CChw/timer/m48t59-isa.ohw/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_PRINTFso that this can not bit-rot so easily again.Signed-off-by Thomas Huth <[email protected]>--- hw/timer/m48t59-internal.h | 9 +++------ hw/timer/m48t59.c | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-)hw/timer/m48t59-internal.h +0
-0@@ -25,13 +25,10 @@#ifndef HW_M48T59_INTERNAL_H #define HW_M48T59_INTERNAL_H 1
hw/timer/m48t59-internal.h line 31
Quoted 10 lines
hw/timer/m48t59-internal.h +3
-6-//#define DEBUG_NVRAM +#define M48T59_DEBUG 0 -#if defined(DEBUG_NVRAM ) -#define NVRAM_PRINTF (fmt, ...) do { printf(fmt , ## __VA_ARGS__); } while (0) -#else -#define NVRAM_PRINTF (fmt, ...) do { } while (0) -#endif +#define NVRAM_PRINTF (fmt, ...) do { \ + if (M48T59_DEBUG) { printf(fmt , ## __VA_ARGS__); } } while (0)
While not use tracepoints directly?
Quoted 26 lines
hw/timer/m48t59-internal.h +0
-0/* * The M48T02, M48T08 and M48T59 chips are very similar. The newer '59 has hw/timer/m48t59.c +2
-2@@ -457,7 +457,7 @@ static void NVRAM_writeb(void *opaque, hwaddr addr, uint64_t val, {M48t59State *NVRAM = opaque; -NVRAM_PRINTF ("%s: 0x%08x => 0x%08x\n" , __func__, addr, val); +NVRAM_PRINTF ("%s: 0x%" HWADDR_PRIx" => 0x%" PRIx64"\n" , __func__, addr, val);switch (addr) {case 0 :NVRAM ->addr &= ~0x00FF ;@@ -489,7 +489,7 @@ static uint64_t NVRAM_readb(void *opaque, hwaddr addr, unsigned size) retval =-1 ;break ; } -NVRAM_PRINTF ("%s: 0x%08x <= 0x%08x\n" , __func__, addr, retval); +NVRAM_PRINTF ("%s: 0x%" HWADDR_PRIx" <= 0x%08x\n" , __func__, addr, retval);return retval; }
Quoted 58 lines · Thomas Huth
When compiling with
NVRAM_PRINTFenabled, 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_PRINTFso that this can not bit-rot so easily again.Signed-off-by Thomas Huth <[email protected]>--- hw/timer/m48t59-internal.h | 9 +++------ hw/timer/m48t59.c | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-)hw/timer/m48t59-internal.h +3
-6@@ -25,13 +25,10 @@#ifndef HW_M48T59_INTERNAL_H #define HW_M48T59_INTERNAL_H 1 -//#define DEBUG_NVRAM +#define M48T59_DEBUG 0 -#if defined(DEBUG_NVRAM ) -#define NVRAM_PRINTF (fmt, ...) do { printf(fmt , ## __VA_ARGS__); } while (0) -#else -#define NVRAM_PRINTF (fmt, ...) do { } while (0) -#endif +#define NVRAM_PRINTF (fmt, ...) do { \ + if (M48T59_DEBUG) { printf(fmt , ## __VA_ARGS__); } } while (0)/* * The M48T02, M48T08 and M48T59 chips are very similar. The newer '59 has hw/timer/m48t59.c +1
-1@@ -457,7 +457,7 @@ static void NVRAM_writeb(void *opaque, hwaddr addr, uint64_t val, {M48t59State *NVRAM = opaque; -NVRAM_PRINTF ("%s: 0x%08x => 0x%08x\n" , __func__, addr, val); +NVRAM_PRINTF ("%s: 0x%" HWADDR_PRIx" => 0x%" PRIx64"\n" , __func__, addr, val);switch (addr) {case 0 :NVRAM ->addr &= ~0x00FF ;
hw/timer/m48t59.c static uint64_t NVRAM_readb(void *opaque, hwaddr addr, unsigned size) · line 495
Quoted 8 lines
hw/timer/m48t59.c +1
-1@@ -489,7 +489,7 @@ static uint64_t NVRAM_readb(void *opaque, hwaddr addr, unsigned size) retval =-1 ;break ; } -NVRAM_PRINTF ("%s: 0x%08x <= 0x%08x\n" , __func__, addr, retval); +NVRAM_PRINTF ("%s: 0x%" HWADDR_PRIx" <= 0x%08x\n" , __func__, addr, retval);return retval; }
Hi Thomas,
I agree with Philippe here that given you've got this far then is it not worth going all the way with a trace-events conversion?
Then again fixing this is enough of an improvement that I'm happy to give my R-B regardless:
ATB,
Mark.