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 <peter.maydell@linaro.org>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Peter Maydell 2015-08-19 16:20:19 +01:00
parent 38e20cac66
commit 71baf787d8
3 changed files with 4 additions and 6 deletions

View File

@ -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);

View File

@ -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++;

View File

@ -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)