[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/38] chardev: tcp: postpone TLS work until machine
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PULL 12/38] chardev: tcp: postpone TLS work until machine done |
Date: |
Fri, 16 Mar 2018 09:04:42 -0500 |
From: "Daniel P. Berrange" <address@hidden>
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 <address@hidden>
[peterx: add missing include line, do unit test]
Signed-off-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
---
chardev/char-socket.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index d92c5aee73f..d057192ced0 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;
}
--
2.14.3
- [Qemu-devel] [PULL 00/38] QAPI patches for 2018-03-12, 2.12 softfreeze, Eric Blake, 2018/03/16
- [Qemu-devel] [PULL 12/38] chardev: tcp: postpone TLS work until machine done,
Eric Blake <=
- [Qemu-devel] [PULL 27/38] qmp: add new event "command-dropped", Eric Blake, 2018/03/16
- [Qemu-devel] [PULL 07/38] qapi: Replace qobject_to_X(o) by qobject_to(X, o), Eric Blake, 2018/03/16
- [Qemu-devel] [PULL 38/38] qapi: Pass '-u' when doing non-silent diff, Eric Blake, 2018/03/16
- Re: [Qemu-devel] [PULL 00/38] QAPI patches for 2018-03-12, 2.12 softfreeze, Peter Maydell, 2018/03/17