* Markus Armbruster (arm...@redhat.com) wrote:
> st_print_trace_file_status() takes an fprintf()-like callback and a
> FILE * to pass to it.
>
> Its only caller hmp_trace_file() 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.
>
> 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>
> ---
> monitor.c | 2 +-
> trace/simple.c | 7 ++++---
> trace/simple.h | 2 +-
> 3 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/monitor.c b/monitor.c
> index 10be8bdb86..a3e66b7159 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -1056,7 +1056,7 @@ static void hmp_trace_file(Monitor *mon, const QDict
> *qdict)
> const char *arg = qdict_get_try_str(qdict, "arg");
>
> if (!op) {
> - st_print_trace_file_status((FILE *)mon, &monitor_fprintf);
> + st_print_trace_file_status();
> } else if (!strcmp(op, "on")) {
> st_set_trace_file_enabled(true);
> } else if (!strcmp(op, "off")) {
> diff --git a/trace/simple.c b/trace/simple.c
> index ac904eca91..fc7106ec49 100644
> --- a/trace/simple.c
> +++ b/trace/simple.c
> @@ -16,6 +16,7 @@
> #include "trace/control.h"
> #include "trace/simple.h"
> #include "qemu/error-report.h"
> +#include "qemu/qemu-print.h"
>
> /** Trace file header event ID, picked to avoid conflict with real event IDs
> */
> #define HEADER_EVENT_ID (~(uint64_t)0)
> @@ -363,10 +364,10 @@ void st_set_trace_file(const char *file)
> st_set_trace_file_enabled(true);
> }
>
> -void st_print_trace_file_status(FILE *stream, int (*stream_printf)(FILE
> *stream, const char *fmt, ...))
> +void st_print_trace_file_status(void)
> {
> - stream_printf(stream, "Trace file \"%s\" %s.\n",
> - trace_file_name, trace_fp ? "on" : "off");
> + qemu_printf("Trace file \"%s\" %s.\n",
> + trace_file_name, trace_fp ? "on" : "off");
> }
>
> void st_flush_trace_buffer(void)
> diff --git a/trace/simple.h b/trace/simple.h
> index 9931808c05..5771a0634f 100644
> --- a/trace/simple.h
> +++ b/trace/simple.h
> @@ -11,7 +11,7 @@
> #ifndef TRACE_SIMPLE_H
> #define TRACE_SIMPLE_H
>
> -void st_print_trace_file_status(FILE *stream, fprintf_function
> stream_printf);
> +void st_print_trace_file_status(void);
> void st_set_trace_file_enabled(bool enable);
> void st_set_trace_file(const char *file);
> bool st_init(void);
> --
> 2.17.2
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
