diff options
-rw-r--r-- | disas.c | 3 | ||||
-rw-r--r-- | include/monitor/monitor.h | 1 | ||||
-rw-r--r-- | monitor.c | 11 |
3 files changed, 2 insertions, 13 deletions
@@ -3,6 +3,7 @@ #include "qemu-common.h" #include "disas/bfd.h" #include "elf.h" +#include "qemu/qemu-print.h" #include "cpu.h" #include "disas/disas.h" @@ -609,7 +610,7 @@ void monitor_disas(Monitor *mon, CPUState *cpu, int count, i; CPUDebug s; - INIT_DISASSEMBLE_INFO(s.info, (FILE *)mon, monitor_fprintf); + INIT_DISASSEMBLE_INFO(s.info, NULL, qemu_fprintf); s.cpu = cpu; s.info.read_memory_func diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 316a168..8665629 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -31,7 +31,6 @@ int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp); int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) GCC_FMT_ATTR(2, 0); int monitor_printf(Monitor *mon, const char *fmt, ...) GCC_FMT_ATTR(2, 3); -int monitor_fprintf(FILE *stream, const char *fmt, ...) GCC_FMT_ATTR(2, 3); void monitor_flush(Monitor *mon); int monitor_set_cpu(int cpu_index); int monitor_get_cpu_index(void); @@ -480,17 +480,6 @@ int monitor_printf(Monitor *mon, const char *fmt, ...) return ret; } -int monitor_fprintf(FILE *stream, const char *fmt, ...) -{ - int ret; - - va_list ap; - va_start(ap, fmt); - ret = monitor_vprintf((Monitor *)stream, fmt, ap); - va_end(ap); - return ret; -} - static void qmp_send_response(Monitor *mon, const QDict *rsp) { const QObject *data = QOBJECT(rsp); |