[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] Use &error_fatal when initializing crypto on qe
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 6/6] Use &error_fatal when initializing crypto on qemu-{img, io, nbd} |
Date: |
Thu, 12 May 2016 11:10:04 -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 | 6 +-----
qemu-io.c | 6 +-----
qemu-nbd.c | 5 +----
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index d3cfec3..5e09a6a 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -3450,7 +3450,6 @@ int main(int argc, char **argv)
{
const img_cmd_t *cmd;
const char *cmdname;
- Error *local_error = NULL;
int c;
static const struct option long_options[] = {
{"help", no_argument, 0, 'h'},
@@ -3467,10 +3466,7 @@ int main(int argc, char **argv)
qemu_init_main_loop(&error_fatal);
- 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 1507559..1a6478c 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -433,7 +433,6 @@ int main(int argc, char **argv)
int opt_index = 0;
int flags = BDRV_O_UNMAP;
bool writethrough = true;
- Error *local_error = NULL;
QDict *opts = NULL;
const char *format = NULL;
@@ -444,10 +443,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 f2685e67..2a30e46 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -521,10 +521,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] [PATCH 0/6] Use &error_fatal in some initialization code, Eduardo Habkost, 2016/05/12
- [Qemu-devel] [PATCH 1/6] vl: Use &error_fatal when parsing VNC options, Eduardo Habkost, 2016/05/12
- [Qemu-devel] [PATCH 2/6] vl: Use &error_fatal when parsing monitor options, Eduardo Habkost, 2016/05/12
- [Qemu-devel] [PATCH 6/6] Use &error_fatal when initializing crypto on qemu-{img, io, nbd},
Eduardo Habkost <=
- [Qemu-devel] [PATCH 3/6] main-loop: Use Error** to report qemu_signal_init() errors, Eduardo Habkost, 2016/05/12
- [Qemu-devel] [PATCH 4/6] main-loop: Use &error_fatal when calling qemu_init_main_loop(), Eduardo Habkost, 2016/05/12
- [Qemu-devel] [PATCH 5/6] main-loop: Make qemu_init_main_loop() and qemu_signal_init() void, Eduardo Habkost, 2016/05/12
- Re: [Qemu-devel] [PATCH 0/6] Use &error_fatal in some initialization code, Paolo Bonzini, 2016/05/12