19aaa4c3fd
Code that doesn't want to know about current monitor vs. stdout vs. stderr takes an fprintf_function callback and a FILE * argument to pass to it. Actual arguments are either fprintf() and stdout or stderr, or 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. New qemu_fprintf() and qemu_vprintf() address this need without type punning: they are like fprintf() and vfprintf(), except they print to the current monitor when passed a null FILE *. The next commits will put them to use. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Message-Id: <20190417191805.28198-14-armbru@redhat.com>
70 lines
1.4 KiB
C
70 lines
1.4 KiB
C
/*
|
|
* Print to stream or current monitor
|
|
*
|
|
* Copyright (C) 2019 Red Hat Inc.
|
|
*
|
|
* Authors:
|
|
* Markus Armbruster <armbru@redhat.com>,
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "monitor/monitor.h"
|
|
#include "qemu/qemu-print.h"
|
|
|
|
/*
|
|
* Print like vprintf().
|
|
* Print to current monitor if we have one, else to stdout.
|
|
*/
|
|
int qemu_vprintf(const char *fmt, va_list ap)
|
|
{
|
|
if (cur_mon) {
|
|
return monitor_vprintf(cur_mon, fmt, ap);
|
|
}
|
|
return vprintf(fmt, ap);
|
|
}
|
|
|
|
/*
|
|
* Print like printf().
|
|
* Print to current monitor if we have one, else to stdout.
|
|
*/
|
|
int qemu_printf(const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
int ret;
|
|
|
|
va_start(ap, fmt);
|
|
ret = qemu_vprintf(fmt, ap);
|
|
va_end(ap);
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* Print like vfprintf()
|
|
* Print to @stream if non-null, else to current monitor.
|
|
*/
|
|
int qemu_vfprintf(FILE *stream, const char *fmt, va_list ap)
|
|
{
|
|
if (!stream) {
|
|
return monitor_vprintf(cur_mon, fmt, ap);
|
|
}
|
|
return vfprintf(stream, fmt, ap);
|
|
}
|
|
|
|
/*
|
|
* Print like fprintf().
|
|
* Print to @stream if non-null, else to current monitor.
|
|
*/
|
|
int qemu_fprintf(FILE *stream, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
int ret;
|
|
|
|
va_start(ap, fmt);
|
|
ret = qemu_vfprintf(stream, fmt, ap);
|
|
va_end(ap);
|
|
return ret;
|
|
}
|