From 5b001a20cedfa66fb65a804d1c216b9effb7894a Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 21 Jul 2015 19:40:27 +0100 Subject: osdep.h: Remove qemu_printf qemu_printf is an ancient remnant which has been a simple #define to printf for over a decade, and is used in only a few places. Expand it out in those places and remove the #define. Signed-off-by: Peter Maydell --- include/qemu/osdep.h | 2 -- monitor.c | 4 ++-- user-exec.c | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 3247364268..e9b8b92f4f 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -99,8 +99,6 @@ typedef signed int int_fast16_t; #define inline always_inline #endif -#define qemu_printf printf - int qemu_daemon(int nochdir, int noclose); void *qemu_try_memalign(size_t alignment, size_t size); void *qemu_memalign(size_t alignment, size_t size); diff --git a/monitor.c b/monitor.c index aeea2b5f9e..fc32f12eef 100644 --- a/monitor.c +++ b/monitor.c @@ -678,7 +678,7 @@ static int get_str(char *buf, int buf_size, const char **pp) case '\"': break; default: - qemu_printf("unsupported escape code: '\\%c'\n", c); + printf("unsupported escape code: '\\%c'\n", c); goto fail; } if ((q - buf) < buf_size - 1) { @@ -692,7 +692,7 @@ static int get_str(char *buf, int buf_size, const char **pp) } } if (*p != '\"') { - qemu_printf("unterminated string\n"); + printf("unterminated string\n"); goto fail; } p++; diff --git a/user-exec.c b/user-exec.c index ed9a07f159..8ad89a466b 100644 --- a/user-exec.c +++ b/user-exec.c @@ -92,8 +92,8 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address, int ret; #if defined(DEBUG_SIGNAL) - qemu_printf("qemu: SIGSEGV pc=0x%08lx address=%08lx w=%d oldset=0x%08lx\n", - pc, address, is_write, *(unsigned long *)old_set); + printf("qemu: SIGSEGV pc=0x%08lx address=%08lx w=%d oldset=0x%08lx\n", + pc, address, is_write, *(unsigned long *)old_set); #endif /* XXX: locking issue */ if (is_write && h2g_valid(address) -- cgit v1.2.3