[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/12] osdep.h: Remove qemu_printf
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 02/12] osdep.h: Remove qemu_printf |
Date: |
Wed, 22 Jul 2015 17:44:01 +0100 |
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 <address@hidden>
---
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 3247364..e9b8b92 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 aeea2b5..fc32f12 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 ed9a07f..8ad89a4 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)
--
1.9.1
- Re: [Qemu-devel] [PATCH 06/12] osdep.h: Move some OS header includes and fixups from qemu-common.h, (continued)
- [Qemu-devel] [PATCH 04/12] compiler.h: Use glue() in QEMU_BUILD_BUG_ON define, Peter Maydell, 2015/07/22
- [Qemu-devel] [PATCH 09/12] apic_internal.h: Include cpu.h directly, Peter Maydell, 2015/07/22
- [Qemu-devel] [PATCH 03/12] osdep.h: Move some compiler-specific things to compiler.h, Peter Maydell, 2015/07/22
- [Qemu-devel] [PATCH 07/12] osdep.h: Add header comment, Peter Maydell, 2015/07/22
- [Qemu-devel] [PATCH 08/12] qemu-common.h: Move muldiv64() to host-utils.h, Peter Maydell, 2015/07/22
- [Qemu-devel] [PATCH 02/12] osdep.h: Remove qemu_printf,
Peter Maydell <=
- [Qemu-devel] [PATCH 05/12] qemu-common.h: Move Win32 fixups into os-win32.h, Peter Maydell, 2015/07/22
- Re: [Qemu-devel] [PATCH 00/12] qemu-common.h/osdep.h refactoring, Paolo Bonzini, 2015/07/22
- Re: [Qemu-devel] [PATCH 00/12] qemu-common.h/osdep.h refactoring, Markus Armbruster, 2015/07/23
- Re: [Qemu-devel] [PATCH 00/12] qemu-common.h/osdep.h refactoring, Daniel P. Berrange, 2015/07/31