Browse Source

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>
pull/24/merge
Peter Maydell 11 years ago
parent
commit
71baf787d8
  1. 2
      include/qemu/osdep.h
  2. 4
      monitor.c
  3. 4
      user-exec.c

2
include/qemu/osdep.h

@ -99,8 +99,6 @@ typedef signed int int_fast16_t;
#define inline always_inline #define inline always_inline
#endif #endif
#define qemu_printf printf
int qemu_daemon(int nochdir, int noclose); int qemu_daemon(int nochdir, int noclose);
void *qemu_try_memalign(size_t alignment, size_t size); void *qemu_try_memalign(size_t alignment, size_t size);
void *qemu_memalign(size_t alignment, size_t size); void *qemu_memalign(size_t alignment, size_t size);

4
monitor.c

@ -678,7 +678,7 @@ static int get_str(char *buf, int buf_size, const char **pp)
case '\"': case '\"':
break; break;
default: default:
qemu_printf("unsupported escape code: '\\%c'\n", c); printf("unsupported escape code: '\\%c'\n", c);
goto fail; goto fail;
} }
if ((q - buf) < buf_size - 1) { if ((q - buf) < buf_size - 1) {
@ -692,7 +692,7 @@ static int get_str(char *buf, int buf_size, const char **pp)
} }
} }
if (*p != '\"') { if (*p != '\"') {
qemu_printf("unterminated string\n"); printf("unterminated string\n");
goto fail; goto fail;
} }
p++; p++;

4
user-exec.c

@ -92,8 +92,8 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,
int ret; int ret;
#if defined(DEBUG_SIGNAL) #if defined(DEBUG_SIGNAL)
qemu_printf("qemu: SIGSEGV pc=0x%08lx address=%08lx w=%d oldset=0x%08lx\n", printf("qemu: SIGSEGV pc=0x%08lx address=%08lx w=%d oldset=0x%08lx\n",
pc, address, is_write, *(unsigned long *)old_set); pc, address, is_write, *(unsigned long *)old_set);
#endif #endif
/* XXX: locking issue */ /* XXX: locking issue */
if (is_write && h2g_valid(address) if (is_write && h2g_valid(address)

Loading…
Cancel
Save