A number of print functions are documented to print to "current monitor if we have one, else stderr". Wrong, they print to the current monitor only when it's HMP. This is the case since commit 4ad417baa43 (error: Print error_report() to stderr if using qmp).
Fix the comments to say "current HMP monitor if we have one". Signed-off-by: Markus Armbruster <[email protected]> --- include/qapi/error.h | 3 ++- monitor/monitor.c | 2 +- util/error-report.c | 26 ++++++++++++++++---------- util/qemu-print.c | 4 ++-- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/include/qapi/error.h b/include/qapi/error.h index 2356b84bb3..d1d37fc656 100644 --- a/include/qapi/error.h +++ b/include/qapi/error.h @@ -64,7 +64,8 @@ * * = Reporting and destroying errors = * - * Report an error to the current monitor if we have one, else stderr: + * Report an error to the current HMP monitor if we have one, else + * stderr: * error_report_err(err); * This frees the error object. * diff --git a/monitor/monitor.c b/monitor/monitor.c index 1273eb7260..c42d9fad58 100644 --- a/monitor/monitor.c +++ b/monitor/monitor.c @@ -269,7 +269,7 @@ void monitor_printc(Monitor *mon, int c) } /* - * Print to current monitor if we have one, else to stderr. + * Print to current HMP monitor if we have one, else to stderr. */ int error_vprintf(const char *fmt, va_list ap) { diff --git a/util/error-report.c b/util/error-report.c index 1b17c11de1..f051f29b2d 100644 --- a/util/error-report.c +++ b/util/error-report.c @@ -136,7 +136,8 @@ void loc_set_file(const char *fname, int lno) } /* - * Print current location to current monitor if we have one, else to stderr. + * Print current location to current HMP monitor if we have one, else + * to stderr. */ static void print_loc(void) { @@ -177,7 +178,8 @@ real_time_iso8601(void) } /* - * Print a message to current monitor if we have one, else to stderr. + * Print a message to current HMP monitor if we have one, else to + * stderr. * @report_type is the type of message: error, warning or informational. * Format arguments like vsprintf(). The resulting message should be * a single phrase, with no newline or trailing punctuation. @@ -217,7 +219,8 @@ static void vreport(report_type type, const char *fmt, va_list ap) } /* - * Print an error message to current monitor if we have one, else to stderr. + * Print an error message to current HMP monitor if we have one, else + * to stderr. * Format arguments like vsprintf(). The resulting message should be * a single phrase, with no newline or trailing punctuation. * Prepend the current location and append a newline. @@ -229,7 +232,8 @@ void error_vreport(const char *fmt, va_list ap) } /* - * Print a warning message to current monitor if we have one, else to stderr. + * Print a warning message to current HMP monitor if we have one, else + * to stderr. * Format arguments like vsprintf(). The resulting message should be * a single phrase, with no newline or trailing punctuation. * Prepend the current location and append a newline. @@ -240,8 +244,8 @@ void warn_vreport(const char *fmt, va_list ap) } /* - * Print an information message to current monitor if we have one, else to - * stderr. + * Print an information message to current HMP monitor if we have one, + * else to stderr. * Format arguments like vsprintf(). The resulting message should be * a single phrase, with no newline or trailing punctuation. * Prepend the current location and append a newline. @@ -252,7 +256,8 @@ void info_vreport(const char *fmt, va_list ap) } /* - * Print an error message to current monitor if we have one, else to stderr. + * Print an error message to current HMP monitor if we have one, else + * to stderr. * Format arguments like sprintf(). The resulting message should be * a single phrase, with no newline or trailing punctuation. * Prepend the current location and append a newline. @@ -268,7 +273,8 @@ void error_report(const char *fmt, ...) } /* - * Print a warning message to current monitor if we have one, else to stderr. + * Print a warning message to current HMP monitor if we have one, else + * to stderr. * Format arguments like sprintf(). The resulting message should be a * single phrase, with no newline or trailing punctuation. * Prepend the current location and append a newline. @@ -283,8 +289,8 @@ void warn_report(const char *fmt, ...) } /* - * Print an information message to current monitor if we have one, else to - * stderr. + * Print an information message to current HMP monitor if we have one, + * else to stderr. * Format arguments like sprintf(). The resulting message should be a * single phrase, with no newline or trailing punctuation. * Prepend the current location and append a newline. diff --git a/util/qemu-print.c b/util/qemu-print.c index 69ba612f56..4a30cd1a8e 100644 --- a/util/qemu-print.c +++ b/util/qemu-print.c @@ -16,7 +16,7 @@ /* * Print like vprintf(). - * Print to current monitor if we have one, else to stdout. + * Print to current HMP monitor if we have one, else to stdout. */ int qemu_vprintf(const char *fmt, va_list ap) { @@ -29,7 +29,7 @@ int qemu_vprintf(const char *fmt, va_list ap) /* * Print like printf(). - * Print to current monitor if we have one, else to stdout. + * Print to current HMP monitor if we have one, else to stdout. */ int qemu_printf(const char *fmt, ...) { -- 2.52.0
