Commit 76c86615 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

tcg: Simplify how dump_drift_info() prints 



dump_drift_info() takes an fprintf()-like callback and a FILE * to pass
to it.

Its only caller hmp_info_jit() passes monitor_fprintf() and a Monitor
* cast to FILE *.  monitor_fprintf() casts it right back, and is
otherwise identical to monitor_printf().  The type-punning is ugly.

Drop the callback, and call qemu_printf() instead.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190417191805.28198-6-armbru@redhat.com>
parent 3de2faa9

cpus.c

+9 −6
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "qapi/qapi-events-run-state.h"

#include "qapi/qmp/qerror.h"

#include "qemu/error-report.h"

#include "qemu/qemu-print.h"

#include "sysemu/sysemu.h"

#include "sysemu/block-backend.h"

#include "exec/gdbstub.h"
@@ -2454,19 +2455,21 @@ void qmp_inject_nmi(Error **errp) 
    nmi_monitor_handle(monitor_get_cpu_index(), errp);

}



void dump_drift_info(FILE *f, fprintf_function cpu_fprintf)

void dump_drift_info(void)

{

    if (!use_icount) {

        return;

    }



    cpu_fprintf(f, "Host - Guest clock  %"PRIi64" ms\n",

    qemu_printf("Host - Guest clock  %"PRIi64" ms\n",

                (cpu_get_clock() - cpu_get_icount())/SCALE_MS);

    if (icount_align_option) {

        cpu_fprintf(f, "Max guest delay     %"PRIi64" ms\n", -max_delay/SCALE_MS);

        cpu_fprintf(f, "Max guest advance   %"PRIi64" ms\n", max_advance/SCALE_MS);

        qemu_printf("Max guest delay     %"PRIi64" ms\n",

                    -max_delay / SCALE_MS);

        qemu_printf("Max guest advance   %"PRIi64" ms\n",

                    max_advance / SCALE_MS);

    } else {

        cpu_fprintf(f, "Max guest delay     NA\n");

        cpu_fprintf(f, "Max guest advance   NA\n");

        qemu_printf("Max guest delay     NA\n");

        qemu_printf("Max guest advance   NA\n");

    }

}

include/sysemu/cpus.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ extern int icount_align_option; 
/* drift information for info jit command */

extern int64_t max_delay;

extern int64_t max_advance;

void dump_drift_info(FILE *f, fprintf_function cpu_fprintf);

void dump_drift_info(void);



/* Unblock cpu */

void qemu_cpu_kick_self(void);

monitor.c

+1 −1
Original line number Diff line number Diff line
@@ -1319,7 +1319,7 @@ static void hmp_info_jit(Monitor *mon, const QDict *qdict) 
    }



    dump_exec_info();

    dump_drift_info((FILE *)mon, monitor_fprintf);

    dump_drift_info();

}



static void hmp_info_opcount(Monitor *mon, const QDict *qdict)