[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/5] Revert "chardev: tcp: postpone TLS work unti
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 1/5] Revert "chardev: tcp: postpone TLS work until machine done" |
Date: |
Thu, 23 Aug 2018 16:31:21 +0200 |
This reverts commit 99f2f54174a595e3ada6e4332fcd2b37ebb0d55d.
See next commit reverting 25679e5d58e258e9950685ffbd0cae4cd40d9cc2 as
well for rationale.
Signed-off-by: Marc-André Lureau <address@hidden>
---
chardev/char-socket.c | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index efbad6ee7c..e28d2cca4c 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -32,7 +32,6 @@
#include "qapi/error.h"
#include "qapi/clone-visitor.h"
#include "qapi/qapi-visit-sockets.h"
-#include "sysemu/sysemu.h"
#include "chardev/char-io.h"
@@ -724,11 +723,6 @@ 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,
@@ -1169,10 +1163,6 @@ 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.18.0.547.g1d89318c48
- [Qemu-devel] [PATCH v2 0/5] Fix socket chardev regression, Marc-André Lureau, 2018/08/23
- [Qemu-devel] [PATCH v2 1/5] Revert "chardev: tcp: postpone TLS work until machine done",
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 2/5] Revert "chardev: tcp: postpone async connection setup", Marc-André Lureau, 2018/08/23
- [Qemu-devel] [PATCH v2 3/5] char-socket: update all ioc handlers when changing context, Marc-André Lureau, 2018/08/23
- [Qemu-devel] [PATCH v2 4/5] test-char: fix random socket test failure, Marc-André Lureau, 2018/08/23
- [Qemu-devel] [PATCH v2 5/5] test-char: add socket reconnect test, Marc-André Lureau, 2018/08/23
- Re: [Qemu-devel] [PATCH v2 0/5] Fix socket chardev regression, Peter Xu, 2018/08/23