* Markus Armbruster (arm...@redhat.com) wrote:
> dump_drift_info() takes an fprintf()-like callback and a FILE * to pass
> to it.
Me thinks there's a pattern here....
> 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: Markus Armbruster <arm...@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> ---
> cpus.c | 15 +++++++++------
> include/sysemu/cpus.h | 2 +-
> monitor.c | 2 +-
> 3 files changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/cpus.c b/cpus.c
> index e83f72b48b..684aa9679a 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -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");
> }
> }
> diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h
> index eea0010b53..ef13a120cc 100644
> --- a/include/sysemu/cpus.h
> +++ b/include/sysemu/cpus.h
> @@ -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);
> diff --git a/monitor.c b/monitor.c
> index 24e4d49d11..7573689585 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -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)
> --
> 2.17.2
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
