[Qemu-devel] [PATCH v2 06/26] monitor: Make monitor_fprintf public before extracting it

[Benoît Canet]

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