aboutsummaryrefslogtreecommitdiff
path: root/chardev/char-socket.c
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2018-03-08 22:07:14 +0800
committerEric Blake <eblake@redhat.com>2018-03-19 14:58:36 -0500
commit99f2f54174a595e3ada6e4332fcd2b37ebb0d55d (patch)
treeaea5f8238133d2847a64ce741f4118b097ac1541 /chardev/char-socket.c
parent4f7be2806e672fa232e406ac5eec26789b9d5f85 (diff)
chardev: tcp: postpone TLS work until machine done
TLS handshake may create background GSource tasks, while we won't know the correct GMainContext until the whole chardev (including frontend) inited. Let's postpone the initial TLS handshake until machine done. For dynamically created tcp chardev, we don't postpone that by checking the init_machine_done variable. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> [peterx: add missing include line, do unit test] Signed-off-by: Peter Xu <peterx@redhat.com> Message-Id: <20180308140714.28906-1-peterx@redhat.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'chardev/char-socket.c')
-rw-r--r--chardev/char-socket.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index d92c5aee73..d057192ced 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -32,6 +32,7 @@
#include "qapi/error.h"
#include "qapi/clone-visitor.h"
#include "qapi/qapi-visit-sockets.h"
+#include "sysemu/sysemu.h"
#include "chardev/char-io.h"
@@ -722,6 +723,11 @@ static void tcp_chr_tls_init(Chardev *chr)
Error *err = NULL;
gchar *name;
+ if (!machine_init_done) {
+ /* This will be postponed to machine_done notifier */
+ return;
+ }
+
if (s->is_listen) {
tioc = qio_channel_tls_new_server(
s->ioc, s->tls_creds,
@@ -1162,6 +1168,10 @@ static int tcp_chr_machine_done_hook(Chardev *chr)
tcp_chr_connect_async(chr);
}
+ if (s->ioc && s->tls_creds) {
+ tcp_chr_tls_init(chr);
+ }
+
return 0;
}