use error_report_fatal() helper instead of a bunch of if (local_err) { error_report(foo); error_free(local_err); exit(1); } code blocks
Signed-off-by: Igor Mammedov <imamm...@redhat.com> --- * s/exit_if_error/error_report_fatal/ * move error_report_fatal() into util/error.c --- include/qemu/error-report.h | 2 ++ util/error.c | 24 ++++++++++++++++++++++++ vl.c | 34 ++++++---------------------------- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/include/qemu/error-report.h b/include/qemu/error-report.h index 7ab2355..a80a1a7 100644 --- a/include/qemu/error-report.h +++ b/include/qemu/error-report.h @@ -16,6 +16,7 @@ #include <stdarg.h> #include <stdbool.h> #include "qemu/compiler.h" +#include "qapi/error.h" typedef struct Location { /* all members are private to qemu-error.c */ @@ -40,6 +41,7 @@ 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); +void error_report_fatal(Error *err, const char *fmt, ...) GCC_FMT_ATTR(2, 3); const char *error_get_progname(void); extern bool enable_timestamp_msg; diff --git a/util/error.c b/util/error.c index 2ace0d8..61d6d21 100644 --- a/util/error.c +++ b/util/error.c @@ -171,3 +171,27 @@ void error_propagate(Error **dst_errp, Error *local_err) error_free(local_err); } } + +void error_report_fatal(Error *err, const char *fmt, ...) +{ + va_list ap; + + if (!err) { + return; + } + + if (fmt) { + char *optional_msg = NULL; + + va_start(ap, fmt); + optional_msg = g_strdup_vprintf(fmt, ap); + va_end(ap); + error_report("%s: %s", optional_msg, error_get_pretty(err)); + g_free(optional_msg); + } else { + error_report("%s", error_get_pretty(err)); + } + + error_free(err); + exit(EXIT_FAILURE); +} diff --git a/vl.c b/vl.c index 528c289..4f03b96 100644 --- a/vl.c +++ b/vl.c @@ -2264,11 +2264,7 @@ static int chardev_init_func(QemuOpts *opts, void *opaque) Error *local_err = NULL; qemu_chr_new_from_opts(opts, NULL, &local_err); - if (local_err) { - error_report("%s", error_get_pretty(local_err)); - error_free(local_err); - return -1; - } + error_report_fatal(local_err, NULL); return 0; } @@ -2674,12 +2670,7 @@ static int machine_set_property(const char *name, const char *value, string_input_visitor_cleanup(siv); g_free(qom_name); - if (local_err) { - qerror_report_err(local_err); - error_free(local_err); - return -1; - } - + error_report_fatal(local_err, NULL); return 0; } @@ -4074,11 +4065,7 @@ int main(int argc, char **argv, char **envp) if (qtest_chrdev) { qtest_init(qtest_chrdev, qtest_log, &local_err); - if (local_err) { - error_report("%s", error_get_pretty(local_err)); - error_free(local_err); - exit(1); - } + error_report_fatal(local_err, NULL); } machine_opts = qemu_get_machine_opts(); @@ -4318,12 +4305,8 @@ int main(int argc, char **argv, char **envp) if (vnc_display) { vnc_display_init(ds); vnc_display_open(ds, vnc_display, &local_err); - if (local_err != NULL) { - error_report("Failed to start VNC server on `%s': %s", - vnc_display, error_get_pretty(local_err)); - error_free(local_err); - exit(1); - } + error_report_fatal(local_err, "Failed to start VNC server on '%s'", + vnc_display); if (show_vnc_port) { printf("VNC server running on `%s'\n", vnc_display_local_addr(ds)); @@ -4371,12 +4354,7 @@ int main(int argc, char **argv, char **envp) if (incoming) { qemu_start_incoming_migration(incoming, &local_err); - if (local_err) { - error_report("-incoming %s: %s", incoming, - error_get_pretty(local_err)); - error_free(local_err); - exit(1); - } + error_report_fatal(local_err, "-incoming %s", incoming); } else if (autostart) { vm_start(); } -- 1.9.3