aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2016-05-12 11:10:04 -0300
committerEduardo Habkost <ehabkost@redhat.com>2016-05-20 14:28:55 -0300
commite8f2d2722eb84a809697e82c762d39c8c13f22f6 (patch)
tree9a6dd203d3a6e65c5b19ef6fc49d0aaf74848749
parent822ac12df0387b2d2eb1ff8fc6cddb46aa0c3867 (diff)
Use &error_fatal when initializing crypto on qemu-{img,io,nbd}
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 <ehabkost@redhat.com>
-rw-r--r--qemu-img.c5
-rw-r--r--qemu-io.c5
-rw-r--r--qemu-nbd.c5
3 files changed, 3 insertions, 12 deletions
diff --git a/qemu-img.c b/qemu-img.c
index 47923663be..7ed8ef21cb 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 5ef3ef7f35..d977a6e553 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 d59b187780..6554f0ab65 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);