summary refs log tree commit diff stats
path: root/qemu-io.c
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2016-04-06 12:12:06 +0100
committerKevin Wolf <kwolf@redhat.com>2016-04-12 18:06:51 +0200
commitc229708848cc77b0277e7260f7e739d441c1d086 (patch)
treea9c124d67dcc8df97249011afbe9084d90ed64e1 /qemu-io.c
parent143605a200f9d418d62d25d91b1477b1d91c0b18 (diff)
downloadfocaccia-qemu-c229708848cc77b0277e7260f7e739d441c1d086.tar.gz
focaccia-qemu-c229708848cc77b0277e7260f7e739d441c1d086.zip
block: initialize qcrypto API at startup
Any programs which call the qcrypto APIs should ensure that
qcrypto_init() has been called before anything else which
can use crypto. Essentially this means right at the start
of the main method before initializing anything else.

This is important because some versions of gnutls/gcrypt
require explicit initialization before use.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Alex Bligh <alex@alex.org.uk>
Tested-by: Alex Bligh <alex@alex.org.uk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qemu-io.c')
-rw-r--r--qemu-io.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/qemu-io.c b/qemu-io.c
index 0a738f12f0..288bba84b9 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -23,6 +23,7 @@
 #include "sysemu/block-backend.h"
 #include "block/block_int.h"
 #include "trace/control.h"
+#include "crypto/init.h"
 
 #define CMD_NOFILE_OK   0x01
 
@@ -443,6 +444,11 @@ 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);
+    }
+
     module_call_init(MODULE_INIT_QOM);
     qemu_add_opts(&qemu_object_opts);
     bdrv_init();