Commit c6c59459 authored by Cornelia Huck's avatar Cornelia Huck Committed by Markus Armbruster
Browse files

qemu-error: make use of {error, warn}_report_once_cond 



{error,warn}_report_once() are a special case of the new functions
and can simply switch to them.

Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
Message-Id: <20180830145902.27376-3-cohuck@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
[Dispense with unlikely() to keep the macros as simple as possible]
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent c55510b7

include/qemu/error-report.h

+10 −20
Original line number Diff line number Diff line
@@ -56,13 +56,8 @@ bool warn_report_once_cond(bool *printed, const char *fmt, ...) 
#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_);              \

        error_report_once_cond(&print_once_,            \

                               fmt, ##__VA_ARGS__);     \

    })



/*
@@ -72,13 +67,8 @@ bool warn_report_once_cond(bool *printed, const char *fmt, ...) 
#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_);              \

        warn_report_once_cond(&print_once_,             \

                              fmt, ##__VA_ARGS__);      \

    })



const char *error_get_progname(void);