[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 1/2] error-report: provide error_report_exit()
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH 1/2] error-report: provide error_report_exit() |
Date: |
Tue, 16 Aug 2016 13:05:19 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
Peter Xu <address@hidden> writes:
> There are many places in current QEMU codes that needs to print some
> error and then quit QEMU. Provide a macro for it.
>
> Also, one coccinelle script is added to convert existing cases to
> leverage this new macro.
>
> Signed-off-by: Peter Xu <address@hidden>
> ---
> include/qemu/error-report.h | 8 ++++++++
> scripts/coccinelle/error_report_exit.cocci | 13 +++++++++++++
> 2 files changed, 21 insertions(+)
> create mode 100644 scripts/coccinelle/error_report_exit.cocci
>
> diff --git a/include/qemu/error-report.h b/include/qemu/error-report.h
> index 499ec8b..c2d5059 100644
> --- a/include/qemu/error-report.h
> +++ b/include/qemu/error-report.h
> @@ -13,6 +13,8 @@
> #ifndef QEMU_ERROR_REPORT_H
> #define QEMU_ERROR_REPORT_H
>
> +#include <unistd.h>
> +
> typedef struct Location {
> /* all members are private to qemu-error.c */
> enum { LOC_NONE, LOC_CMDLINE, LOC_FILE } kind;
> @@ -36,6 +38,12 @@ void error_printf_unless_qmp(const char *fmt, ...)
> GCC_FMT_ATTR(1, 2);
> void error_set_progname(const char *argv0);
> void error_vreport(const char *fmt, va_list ap) GCC_FMT_ATTR(1, 0);
> void error_report(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
> +
> +#define error_report_exit(...) do { \
> + error_report(__VA_ARGS__); \
> + exit(1); \
> + } while (0)
> +
Let's call it error_report_fatal(), for consistency with error_fatal.
Also, please make it a function, not a macro:
void error_report_fatal(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
error_vreport(fmt, ap);
va_end(ap);
exit(1);
}
> const char *error_get_progname(void);
> extern bool enable_timestamp_msg;
>
> diff --git a/scripts/coccinelle/error_report_exit.cocci
> b/scripts/coccinelle/error_report_exit.cocci
> new file mode 100644
> index 0000000..49f6c17
> --- /dev/null
> +++ b/scripts/coccinelle/error_report_exit.cocci
> @@ -0,0 +1,13 @@
> +@@
> +expression list X;
> +@@
> +
> +-error_report(X);
> ++error_report_exit(X);
> +-exit(
> +(
> +-1
> +|
> +-EXIT_FAILURE
> +)
> +-);
- [Qemu-devel] [PATCH 0/2] error-report: introduce error_report_exit(), Peter Xu, 2016/08/11
- [Qemu-devel] [PATCH 1/2] error-report: provide error_report_exit(), Peter Xu, 2016/08/11
- Re: [Qemu-devel] [PATCH 1/2] error-report: provide error_report_exit(),
Markus Armbruster <=
- Re: [Qemu-devel] [PATCH 1/2] error-report: provide error_report_exit(), Fam Zheng, 2016/08/16
- Re: [Qemu-devel] [PATCH 1/2] error-report: provide error_report_exit(), Peter Xu, 2016/08/16
- Re: [Qemu-devel] [PATCH 1/2] error-report: provide error_report_exit(), Fam Zheng, 2016/08/16
- Re: [Qemu-devel] [PATCH 1/2] error-report: provide error_report_exit(), Peter Xu, 2016/08/16
- Re: [Qemu-devel] [PATCH 1/2] error-report: provide error_report_exit(), Fam Zheng, 2016/08/16
- Re: [Qemu-devel] [PATCH 1/2] error-report: provide error_report_exit(), Markus Armbruster, 2016/08/16
- Re: [Qemu-devel] [PATCH 1/2] error-report: provide error_report_exit(), Peter Xu, 2016/08/17
- Re: [Qemu-devel] [PATCH 1/2] error-report: provide error_report_exit(), Markus Armbruster, 2016/08/17
- Re: [Qemu-devel] [PATCH 1/2] error-report: provide error_report_exit(), Peter Xu, 2016/08/17
- Re: [Qemu-devel] [PATCH 1/2] error-report: provide error_report_exit(), Peter Xu, 2016/08/17