public/qemu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

monitor: Clean up how monitor_disas() funnels output to monitor

Browse source 
INIT_DISASSEMBLE_INFO() takes an fprintf()-like callback and a FILE *
to pass to it.  monitor_disas() passes monitor_fprintf() and the
current monitor cast to FILE *.  monitor_fprintf() casts it right
back, and is otherwise identical to monitor_printf().  The
type-punning is ugly.

Pass qemu_fprintf() and NULL instead.

monitor_fprintf() is now unused; delete it.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190417191805.28198-16-armbru@redhat.com>
[Commit message typo corrected]
This commit is contained in:
Markus Armbruster 2019-04-17 21:18:03 +02:00
parent 90c84c5600
commit 30cc98315f
3 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
disas.c
View file

@ -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

1
include/monitor/monitor.h
View file

@ -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);

11
monitor.c
View file

@ -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);