From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeMMq-0002ue-BE for qemu-devel@nongnu.org; Wed, 15 Oct 2014 07:03:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XeMMh-00020d-7e for qemu-devel@nongnu.org; Wed, 15 Oct 2014 07:03:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48211) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeMMh-00020Q-11 for qemu-devel@nongnu.org; Wed, 15 Oct 2014 07:03:35 -0400 From: Igor Mammedov Date: Wed, 15 Oct 2014 13:03:23 +0200 Message-Id: <1413371003-43597-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1413371003-43597-1-git-send-email-imammedo@redhat.com> References: <1413371003-43597-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] vl.c: reduce exit on error code duplication List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aliguori@amazon.com use exit_if_error() 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 --- vl.c | 58 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/vl.c b/vl.c index f563da1..151ee2d 100644 --- a/vl.c +++ b/vl.c @@ -582,6 +582,30 @@ static void res_free(void) } } +static void GCC_FMT_ATTR(2, 3) exit_if_error(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); +} + static int default_driver_check(QemuOpts *opts, void *opaque) { const char *driver = qemu_opt_get(opts, "driver"); @@ -2380,11 +2404,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; - } + exit_if_error(local_err, NULL); return 0; } @@ -2790,12 +2810,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; - } - + exit_if_error(local_err, NULL); return 0; } @@ -4190,11 +4205,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); - } + exit_if_error(local_err, NULL); } machine_opts = qemu_get_machine_opts(); @@ -4434,12 +4445,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); - } + exit_if_error(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)); @@ -4487,12 +4494,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); - } + exit_if_error(local_err, "-incoming %s", incoming); } else if (autostart) { vm_start(); } -- 1.9.3 (Apple Git-50)