| Message ID | 1500235468-15341-25-git-send-email-cota@braap.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/16/2017 10:04 AM, Emilio G. Cota wrote: > And fix the following warning when DEBUG_TB_INVALIDATE is enabled > in translate-all.c: > > CC mipsn32-linux-user/accel/tcg/translate-all.o > /data/src/qemu/accel/tcg/translate-all.c: In function ‘tb_alloc_page’: > /data/src/qemu/accel/tcg/translate-all.c:1201:16: error: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘tb_page_addr_t {aka unsigned int}’ [-Werror=format=] > printf("protecting code page: 0x" TARGET_FMT_lx "\n", > ^ > cc1: all warnings being treated as errors > /data/src/qemu/rules.mak:66: recipe for target 'accel/tcg/translate-all.o' failed > make[1]: *** [accel/tcg/translate-all.o] Error 1 > Makefile:328: recipe for target 'subdir-mipsn32-linux-user' failed > make: *** [subdir-mipsn32-linux-user] Error 2 > cota@flamenco:/data/src/qemu/build ((18f3fe1...) *$)$ > > Signed-off-by: Emilio G. Cota<cota@braap.org> > --- > include/exec/exec-all.h | 2 ++ > accel/tcg/translate-all.c | 3 +-- > 2 files changed, 3 insertions(+), 2 deletions(-) Reviewed-by: Richard Henderson <rth@twiddle.net> r~
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index b3f04c3..13975af 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -31,8 +31,10 @@ type. */ #if defined(CONFIG_USER_ONLY) typedef abi_ulong tb_page_addr_t; +#define TB_PAGE_ADDR_FMT TARGET_ABI_FMT_lx #else typedef ram_addr_t tb_page_addr_t; +#define TB_PAGE_ADDR_FMT RAM_ADDR_FMT #endif /* is_jmp field values */ diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index c38448c..c8fa86a 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1198,8 +1198,7 @@ static inline void tb_alloc_page(TranslationBlock *tb, mprotect(g2h(page_addr), qemu_host_page_size, (prot & PAGE_BITS) & ~PAGE_WRITE); #ifdef DEBUG_TB_INVALIDATE - printf("protecting code page: 0x" TARGET_FMT_lx "\n", - page_addr); + printf("protecting code page: 0x" TB_PAGE_ADDR_FMT "\n", page_addr); #endif } #else
And fix the following warning when DEBUG_TB_INVALIDATE is enabled in translate-all.c: CC mipsn32-linux-user/accel/tcg/translate-all.o /data/src/qemu/accel/tcg/translate-all.c: In function ‘tb_alloc_page’: /data/src/qemu/accel/tcg/translate-all.c:1201:16: error: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘tb_page_addr_t {aka unsigned int}’ [-Werror=format=] printf("protecting code page: 0x" TARGET_FMT_lx "\n", ^ cc1: all warnings being treated as errors /data/src/qemu/rules.mak:66: recipe for target 'accel/tcg/translate-all.o' failed make[1]: *** [accel/tcg/translate-all.o] Error 1 Makefile:328: recipe for target 'subdir-mipsn32-linux-user' failed make: *** [subdir-mipsn32-linux-user] Error 2 cota@flamenco:/data/src/qemu/build ((18f3fe1...) *$)$ Signed-off-by: Emilio G. Cota <cota@braap.org> --- include/exec/exec-all.h | 2 ++ accel/tcg/translate-all.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-)