diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2018-08-17 15:52:21 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-10-02 19:09:11 +0200 |
| commit | ded2bcdf3724b80da86b984ae31abf1ebb6369af (patch) | |
| tree | 77182330bd32b9015de77617fcdeb0e7373b802e | |
| parent | 1cd3d492624da399d66c4c3e6a5eabb8f96bb0a2 (diff) | |
| download | qemu-ded2bcdf3724b80da86b984ae31abf1ebb6369af.zip qemu-ded2bcdf3724b80da86b984ae31abf1ebb6369af.tar.gz qemu-ded2bcdf3724b80da86b984ae31abf1ebb6369af.tar.bz2 | |
Revert "chardev: tcp: postpone TLS work until machine done"
This reverts commit 99f2f54174a595e3ada6e4332fcd2b37ebb0d55d.
See next commit reverting 25679e5d58e258e9950685ffbd0cae4cd40d9cc2 as
well for rationale.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180817135224.22971-2-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | chardev/char-socket.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/chardev/char-socket.c b/chardev/char-socket.c index efbad6e..e28d2cc 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; } |