From patchwork Thu May 12 14:10:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 9081671 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CC3E0BF29F for ; Thu, 12 May 2016 14:10:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 37C6D201F4 for ; Thu, 12 May 2016 14:10:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 721C7201E4 for ; Thu, 12 May 2016 14:10:56 +0000 (UTC) Received: from localhost ([::1]:57665 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0rKJ-0006iT-4L for patchwork-qemu-devel@patchwork.kernel.org; Thu, 12 May 2016 10:10:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0rJs-0006Us-Ml for qemu-devel@nongnu.org; Thu, 12 May 2016 10:10:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b0rJj-0005ox-S5 for qemu-devel@nongnu.org; Thu, 12 May 2016 10:10:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54061) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0rJh-0005oO-Cf for qemu-devel@nongnu.org; Thu, 12 May 2016 10:10:19 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 061E680084 for ; Thu, 12 May 2016 14:10:17 +0000 (UTC) Received: from localhost (vpn1-6-225.gru2.redhat.com [10.97.6.225]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4CEAFqG014930; Thu, 12 May 2016 10:10:16 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org, Paolo Bonzini Date: Thu, 12 May 2016 11:10:02 -0300 Message-Id: <1463062204-20330-5-git-send-email-ehabkost@redhat.com> In-Reply-To: <1463062204-20330-1-git-send-email-ehabkost@redhat.com> References: <1463062204-20330-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 12 May 2016 14:10:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/6] main-loop: Use &error_fatal when calling qemu_init_main_loop() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Eduardo Habkost --- qemu-img.c | 5 +---- qemu-io.c | 5 +---- qemu-nbd.c | 5 +---- vl.c | 6 +----- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 46f2a6d..d3cfec3 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -3465,10 +3465,7 @@ int main(int argc, char **argv) error_set_progname(argv[0]); qemu_init_exec_dir(argv[0]); - if (qemu_init_main_loop(&local_error)) { - error_report_err(local_error); - exit(EXIT_FAILURE); - } + qemu_init_main_loop(&error_fatal); if (qcrypto_init(&local_error) < 0) { error_reportf_err(local_error, "cannot initialize crypto: "); diff --git a/qemu-io.c b/qemu-io.c index 0598251..1507559 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -527,10 +527,7 @@ int main(int argc, char **argv) exit(1); } - if (qemu_init_main_loop(&local_error)) { - error_report_err(local_error); - exit(1); - } + qemu_init_main_loop(&error_fatal); if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, diff --git a/qemu-nbd.c b/qemu-nbd.c index c55b40f..f2685e67 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -820,10 +820,7 @@ int main(int argc, char **argv) saddr = nbd_build_socket_address(sockpath, bindto, port); - if (qemu_init_main_loop(&local_err)) { - error_report_err(local_err); - exit(EXIT_FAILURE); - } + qemu_init_main_loop(&error_fatal); bdrv_init(); atexit(bdrv_close_all); diff --git a/vl.c b/vl.c index eea8a04..e435926 100644 --- a/vl.c +++ b/vl.c @@ -2964,7 +2964,6 @@ int main(int argc, char **argv, char **envp) ram_addr_t maxram_size; uint64_t ram_slots = 0; FILE *vmstate_dump_file = NULL; - Error *main_loop_err = NULL; Error *err = NULL; qemu_init_cpu_loop(); @@ -4001,10 +4000,7 @@ int main(int argc, char **argv, char **envp) os_daemonize(); - if (qemu_init_main_loop(&main_loop_err)) { - error_report_err(main_loop_err); - exit(1); - } + qemu_init_main_loop(&error_fatal); if (qemu_opts_foreach(qemu_find_opts("sandbox"), parse_sandbox, NULL, NULL)) {