Skip to content

Commit e8f2d27

Browse files
committed
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 <[email protected]>
1 parent 822ac12 commit e8f2d27

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed

qemu-img.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3492,10 +3492,7 @@ int main(int argc, char **argv)
34923492
exit(EXIT_FAILURE);
34933493
}
34943494

3495-
if (qcrypto_init(&local_error) < 0) {
3496-
error_reportf_err(local_error, "cannot initialize crypto: ");
3497-
exit(1);
3498-
}
3495+
qcrypto_init(&error_fatal);
34993496

35003497
module_call_init(MODULE_INIT_QOM);
35013498
bdrv_init();

qemu-io.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,7 @@ int main(int argc, char **argv)
466466
progname = basename(argv[0]);
467467
qemu_init_exec_dir(argv[0]);
468468

469-
if (qcrypto_init(&local_error) < 0) {
470-
error_reportf_err(local_error, "cannot initialize crypto: ");
471-
exit(1);
472-
}
469+
qcrypto_init(&error_fatal);
473470

474471
module_call_init(MODULE_INIT_QOM);
475472
qemu_add_opts(&qemu_object_opts);

qemu-nbd.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -527,10 +527,7 @@ int main(int argc, char **argv)
527527
sa_sigterm.sa_handler = termsig_handler;
528528
sigaction(SIGTERM, &sa_sigterm, NULL);
529529

530-
if (qcrypto_init(&local_err) < 0) {
531-
error_reportf_err(local_err, "cannot initialize crypto: ");
532-
exit(1);
533-
}
530+
qcrypto_init(&error_fatal);
534531

535532
module_call_init(MODULE_INIT_QOM);
536533
qemu_add_opts(&qemu_object_opts);

0 commit comments

Comments
 (0)