[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/21] Use &error_fatal when initializing crypto on q
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 21/21] Use &error_fatal when initializing crypto on qemu-{img, io, nbd} |
Date: |
Fri, 20 May 2016 17:28:41 -0300 |
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 <address@hidden>
---
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);
--
2.5.5
- [Qemu-devel] [PULL 00/21] Machine Core queue, 2016-05-20, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 19/21] vl: Use &error_fatal when parsing VNC options, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 07/21] curses: curses_display_init() stub, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 09/21] cocoa: cocoa_display_init() stub, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 08/21] sdl: Initialization stubs, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 18/21] machine: add properties to compat_props incrementaly, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 21/21] Use &error_fatal when initializing crypto on qemu-{img, io, nbd},
Eduardo Habkost <=
- [Qemu-devel] [PULL 02/21] vl: Use exit(1) when requested VGA interface is unavailable, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 01/21] pc-dimm: correct comment of MemoryHotplugState, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 16/21] vl: Make display_remote a local variable, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 03/21] vl: Table-based select_vgahw(), Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 04/21] vl: Replace *_vga_available() functions with class_names field, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 12/21] milkymist: Move DT_NOGRAPHIC check outside milkymist_tmu2_create(), Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 13/21] vl: Replace DT_NOGRAPHIC with machine option, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 14/21] vl: Make display_type a local variable, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 11/21] spice: Initialization stubs on qemu-spice.h, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 05/21] vl: Add DT_COCOA DisplayType value, Eduardo Habkost, 2016/05/20