From patchwork Fri May 20 20:28:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 9130189 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EAFFD60221 for ; Fri, 20 May 2016 23:21:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDE9A27CF9 for ; Fri, 20 May 2016 23:21:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D2CAA27E72; Fri, 20 May 2016 23:21:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 8785F27CF9 for ; Fri, 20 May 2016 23:21:59 +0000 (UTC) Received: from localhost ([::1]:37944 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3tjy-0000Hb-3t for patchwork-qemu-devel@patchwork.kernel.org; Fri, 20 May 2016 19:21:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3t8P-0002ET-5i for qemu-devel@nongnu.org; Fri, 20 May 2016 18:43:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3r35-0001D8-I3 for qemu-devel@nongnu.org; Fri, 20 May 2016 16:29:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36034) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3r35-0001D3-Bq for qemu-devel@nongnu.org; Fri, 20 May 2016 16:29:31 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 F191DC04B308; Fri, 20 May 2016 20:29:30 +0000 (UTC) Received: from localhost (vpn1-7-50.gru2.redhat.com [10.97.7.50]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4KKTUEG032103; Fri, 20 May 2016 16:29:30 -0400 From: Eduardo Habkost To: Peter Maydell Date: Fri, 20 May 2016 17:28:41 -0300 Message-Id: <1463776121-13529-22-git-send-email-ehabkost@redhat.com> In-Reply-To: <1463776121-13529-1-git-send-email-ehabkost@redhat.com> References: <1463776121-13529-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 20 May 2016 20:29:31 +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] [PULL 21/21] Use &error_fatal when initializing crypto on qemu-{img, io, nbd} 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: Marcel Apfelbaum , Paolo Bonzini , qemu-devel@nongnu.org, "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP In addition to making the code simpler, this will replace the long error messages: cannot initialize crypto: Unable to initialize GNUTLS library: [...] cannot initialize crypto: Unable to initialize gcrypt with shorter messages: Unable to initialize GNUTLS library: [...] Unable to initialize gcrypt Signed-off-by: Eduardo Habkost --- qemu-img.c | 5 +---- qemu-io.c | 5 +---- qemu-nbd.c | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 4792366..7ed8ef2 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -3492,10 +3492,7 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } - if (qcrypto_init(&local_error) < 0) { - error_reportf_err(local_error, "cannot initialize crypto: "); - exit(1); - } + qcrypto_init(&error_fatal); module_call_init(MODULE_INIT_QOM); bdrv_init(); diff --git a/qemu-io.c b/qemu-io.c index 5ef3ef7..d977a6e 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -466,10 +466,7 @@ int main(int argc, char **argv) progname = basename(argv[0]); qemu_init_exec_dir(argv[0]); - if (qcrypto_init(&local_error) < 0) { - error_reportf_err(local_error, "cannot initialize crypto: "); - exit(1); - } + qcrypto_init(&error_fatal); module_call_init(MODULE_INIT_QOM); qemu_add_opts(&qemu_object_opts); diff --git a/qemu-nbd.c b/qemu-nbd.c index d59b187..6554f0a 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -527,10 +527,7 @@ int main(int argc, char **argv) sa_sigterm.sa_handler = termsig_handler; sigaction(SIGTERM, &sa_sigterm, NULL); - if (qcrypto_init(&local_err) < 0) { - error_reportf_err(local_err, "cannot initialize crypto: "); - exit(1); - } + qcrypto_init(&error_fatal); module_call_init(MODULE_INIT_QOM); qemu_add_opts(&qemu_object_opts);