Commit 30cc9831 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190417191805.28198-16-armbru@redhat.com>
[Commit message typo corrected]
parent 90c84c56

disas.c

+2 −1
Original line number Diff line number Diff line
@@ -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

include/monitor/monitor.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

monitor.c

+0 −11
Original line number Diff line number Diff line
@@ -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);