From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fudC5-0005L9-KH for qemu-devel@nongnu.org; Tue, 28 Aug 2018 08:34:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fudC4-0006Cy-01 for qemu-devel@nongnu.org; Tue, 28 Aug 2018 08:34:01 -0400 From: Cornelia Huck Date: Tue, 28 Aug 2018 14:33:44 +0200 Message-Id: <20180828123346.17548-2-cohuck@redhat.com> In-Reply-To: <20180828123346.17548-1-cohuck@redhat.com> References: <20180828123346.17548-1-cohuck@redhat.com> Subject: [Qemu-devel] [PATCH 1/3] qemu-error: add {error, warn}_report_once_cond List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: Peter Xu , Halil Pasic , qemu-devel@nongnu.org, qemu-s390x@nongnu.org, Cornelia Huck Add two functions to print an error/warning report once depending on a passed-in condition variable and flip it if printed. This is useful if you want to print a message not once-globally, but e.g. once-per-device. Inspired by warn_once() in hw/vfio/ccw.c. Signed-off-by: Cornelia Huck --- include/qemu/error-report.h | 5 +++++ util/qemu-error.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/include/qemu/error-report.h b/include/qemu/error-report.h index 72fab2b031..d2a6515e68 100644 --- a/include/qemu/error-report.h +++ b/include/qemu/error-report.h @@ -44,6 +44,11 @@ void error_report(const char *fmt, ...) GCC_FMT_ATTR(1, 2); void warn_report(const char *fmt, ...) GCC_FMT_ATTR(1, 2); void info_report(const char *fmt, ...) GCC_FMT_ATTR(1, 2); +void error_report_once_cond(bool *printed, const char *fmt, ...) + GCC_FMT_ATTR(2, 3); +void warn_report_once_cond(bool *printed, const char *fmt, ...) + GCC_FMT_ATTR(2, 3); + /* * Similar to error_report(), except it prints the message just once. * Return true when it prints, false otherwise. diff --git a/util/qemu-error.c b/util/qemu-error.c index a25d3b94c6..0894ab6995 100644 --- a/util/qemu-error.c +++ b/util/qemu-error.c @@ -310,3 +310,47 @@ void info_report(const char *fmt, ...) vreport(REPORT_TYPE_INFO, fmt, ap); va_end(ap); } + +/* + * If *printed is false, print an error message to current monitor if we + * have one, else to stderr, and flip *printed to true. + * If printed is NULL, do not print anything. + * 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. + * It's wrong to call this in a QMP monitor. Use error_setg() there. + */ +void error_report_once_cond(bool *printed, const char *fmt, ...) +{ + va_list ap; + + if (!printed || *printed) { + return; + } + *printed = true; + va_start(ap, fmt); + vreport(REPORT_TYPE_ERROR, fmt, ap); + va_end(ap); +} + +/* + * If *printed is false, print a warning message to current monitor if we + * have one, else to stderr, and flip *printed to true. + * If printed is NULL, do not print anything. + * 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. + * It's wrong to call this in a QMP monitor. Use error_setg() there. + */ +void warn_report_once_cond(bool *printed, const char *fmt, ...) +{ + va_list ap; + + if (!printed || *printed) { + return; + } + *printed = true; + va_start(ap, fmt); + vreport(REPORT_TYPE_WARNING, fmt, ap); + va_end(ap); +} -- 2.14.4