[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/26] monitor: Make monitor_fprintf public befor
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH v2 06/26] monitor: Make monitor_fprintf public before extracting it |
Date: |
Fri, 15 Aug 2014 15:35:38 +0200 |
Signed-off-by: Benoît Canet <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
disas.c | 10 ----------
include/monitor/monitor.h | 2 ++
monitor.c | 4 ++--
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/disas.c b/disas.c
index 44a019a..b174f26 100644
--- a/disas.c
+++ b/disas.c
@@ -435,16 +435,6 @@ monitor_read_memory (bfd_vma memaddr, bfd_byte *myaddr,
int length,
return 0;
}
-static int GCC_FMT_ATTR(2, 3)
-monitor_fprintf(FILE *stream, const char *fmt, ...)
-{
- va_list ap;
- va_start(ap, fmt);
- monitor_vprintf((Monitor *)stream, fmt, ap);
- va_end(ap);
- return 0;
-}
-
/* Disassembler for the monitor.
See target_disas for a description of flags. */
void monitor_disas(Monitor *mon, CPUArchState *env,
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index bd9a1f2..0155390 100644
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -77,4 +77,6 @@ void add_completion_option(ReadLineState *rs, const char *str,
void monitor_user_noop(Monitor *mon, const QObject *data);
int do_qmp_capabilities(Monitor *mon, const QDict *params, QObject **ret_data);
+int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream, const char *fmt, ...);
+
#endif /* !MONITOR_H */
diff --git a/monitor.c b/monitor.c
index 8c90c11..5e73536 100644
--- a/monitor.c
+++ b/monitor.c
@@ -328,8 +328,8 @@ void monitor_printf(Monitor *mon, const char *fmt, ...)
va_end(ap);
}
-static int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream,
- const char *fmt, ...)
+int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream,
+ const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
--
2.1.0.rc1
- [Qemu-devel] [PATCH v2 00/26] Extract qmp.c and monitor.c core and wire QMP into qemu-nbd, Benoît Canet, 2014/08/15
- [Qemu-devel] [PATCH v2 03/26] monitor: Convert Monitor reset_seen field too boolean, Benoît Canet, 2014/08/15
- [Qemu-devel] [PATCH v2 04/26] monitor: Convert mon_cmd_t to MonitorCommand, Benoît Canet, 2014/08/15
- [Qemu-devel] [PATCH v2 06/26] monitor: Make monitor_fprintf public before extracting it,
Benoît Canet <=
- [Qemu-devel] [PATCH v2 01/26] qmp: Extract system emulation related code from qmp.c into qmp-system.c, Benoît Canet, 2014/08/15
- [Qemu-devel] [PATCH v2 11/26] monitor: Make do_info_help public, Benoît Canet, 2014/08/15
- [Qemu-devel] [PATCH v2 07/26] monitor: Extract monitor_fprintf to monitor-system.c, Benoît Canet, 2014/08/15
- [Qemu-devel] [PATCH v2 12/26] monitor: Extract do_info_help in monitor-system.c, Benoît Canet, 2014/08/15
- [Qemu-devel] [PATCH v2 02/26] monitor: Make some function public, Benoît Canet, 2014/08/15
- [Qemu-devel] [PATCH v2 08/26] monitor: Extract qmp_human_monitor_command into monitor-system.c, Benoît Canet, 2014/08/15
- [Qemu-devel] [PATCH v2 24/26] qemu-nbd: build QAPI block core into qemu-nbd, Benoît Canet, 2014/08/15
- [Qemu-devel] [PATCH v2 05/26] monitor: Extract monitor-system.h header, Benoît Canet, 2014/08/15
- [Qemu-devel] [PATCH v2 20/26] monitor: Move qmp_rtc_reset_reinjection from monitor.c to monitor-system.c, Benoît Canet, 2014/08/15
- [Qemu-devel] [PATCH v2 10/26] monitor: Extract a couple of function to monitor-system.c, Benoît Canet, 2014/08/15