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

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

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