[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/4] qemu-error: make use of {error, warn}_report_onc
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 2/4] qemu-error: make use of {error, warn}_report_once_cond |
Date: |
Mon, 24 Sep 2018 17:46:53 +0200 |
From: Cornelia Huck <address@hidden>
{error,warn}_report_once() are a special case of the new functions
and can simply switch to them.
Signed-off-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Dispense with unlikely() to keep the macros as simple as possible]
Signed-off-by: Markus Armbruster <address@hidden>
---
include/qemu/error-report.h | 30 ++++++++++--------------------
1 file changed, 10 insertions(+), 20 deletions(-)
diff --git a/include/qemu/error-report.h b/include/qemu/error-report.h
index e415128ac4..0a8d9cc9ea 100644
--- a/include/qemu/error-report.h
+++ b/include/qemu/error-report.h
@@ -53,32 +53,22 @@ bool warn_report_once_cond(bool *printed, const char *fmt,
...)
* Similar to error_report(), except it prints the message just once.
* Return true when it prints, false otherwise.
*/
-#define error_report_once(fmt, ...) \
- ({ \
- static bool print_once_; \
- bool ret_print_once_ = !print_once_; \
- \
- if (!print_once_) { \
- print_once_ = true; \
- error_report(fmt, ##__VA_ARGS__); \
- } \
- unlikely(ret_print_once_); \
+#define error_report_once(fmt, ...) \
+ ({ \
+ static bool print_once_; \
+ error_report_once_cond(&print_once_, \
+ fmt, ##__VA_ARGS__); \
})
/*
* Similar to warn_report(), except it prints the message just once.
* Return true when it prints, false otherwise.
*/
-#define warn_report_once(fmt, ...) \
- ({ \
- static bool print_once_; \
- bool ret_print_once_ = !print_once_; \
- \
- if (!print_once_) { \
- print_once_ = true; \
- warn_report(fmt, ##__VA_ARGS__); \
- } \
- unlikely(ret_print_once_); \
+#define warn_report_once(fmt, ...) \
+ ({ \
+ static bool print_once_; \
+ warn_report_once_cond(&print_once_, \
+ fmt, ##__VA_ARGS__); \
})
const char *error_get_progname(void);
--
2.17.1
- [Qemu-devel] [PULL 0/4] Error reporting & miscellaneous patches for 2018-09-24, Markus Armbruster, 2018/09/24
- [Qemu-devel] [PULL 4/4] MAINTAINERS: Fix F: patterns that don't match anything, Markus Armbruster, 2018/09/24
- [Qemu-devel] [PULL 2/4] qemu-error: make use of {error, warn}_report_once_cond,
Markus Armbruster <=
- [Qemu-devel] [PULL 1/4] qemu-error: add {error, warn}_report_once_cond, Markus Armbruster, 2018/09/24
- [Qemu-devel] [PULL 3/4] Drop "qemu:" prefix from error_report() arguments, Markus Armbruster, 2018/09/24
- Re: [Qemu-devel] [PULL 0/4] Error reporting & miscellaneous patches for 2018-09-24, Peter Maydell, 2018/09/25