[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 9/9] chardev: tcp: postpone TLS work until machin
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v2 9/9] chardev: tcp: postpone TLS work until machine done |
Date: |
Tue, 6 Mar 2018 13:33:20 +0800 |
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: Peter Xu <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 bd40864f87..997c70dd7d 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -31,6 +31,7 @@
#include "qemu/option.h"
#include "qapi/error.h"
#include "qapi/clone-visitor.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,
@@ -1145,6 +1151,10 @@ static int tcp_chr_machine_done_hook(Chardev *chr)
tcp_chr_connect_async(chr);
}
+ if (s->tls_creds) {
+ tcp_chr_tls_init(chr);
+ }
+
return 0;
}
--
2.14.3
- [Qemu-devel] [PATCH v2 4/9] chardev: allow telnet gsource to switch gcontext, (continued)
- [Qemu-devel] [PATCH v2 4/9] chardev: allow telnet gsource to switch gcontext, Peter Xu, 2018/03/06
- [Qemu-devel] [PATCH v2 5/9] chardev: introduce chr_machine_done hook, Peter Xu, 2018/03/06
- [Qemu-devel] [PATCH v2 6/9] chardev: use chardev's gcontext for async connect, Peter Xu, 2018/03/06
- [Qemu-devel] [PATCH v2 7/9] chardev: tcp: postpone async connection setup, Peter Xu, 2018/03/06
- [Qemu-devel] [PATCH v2 8/9] chardev: tcp: let TLS run on chardev context, Peter Xu, 2018/03/06
- [Qemu-devel] [PATCH v2 9/9] chardev: tcp: postpone TLS work until machine done,
Peter Xu <=
- Re: [Qemu-devel] [PATCH v2 9/9] chardev: tcp: postpone TLS work until machine done, Peter Xu, 2018/03/07
- Re: [Qemu-devel] [PATCH v2 9/9] chardev: tcp: postpone TLS work until machine done, Daniel P . Berrangé, 2018/03/08
- Re: [Qemu-devel] [PATCH v2 9/9] chardev: tcp: postpone TLS work until machine done, Peter Xu, 2018/03/08
- Re: [Qemu-devel] [PATCH v2 9/9] chardev: tcp: postpone TLS work until machine done, Daniel P . Berrangé, 2018/03/08
- Re: [Qemu-devel] [PATCH v2 9/9] chardev: tcp: postpone TLS work until machine done, Peter Xu, 2018/03/08
[Qemu-devel] [PATCH v2.1 9/9] chardev: tcp: postpone TLS work until machine done, Peter Xu, 2018/03/08