Skip to content

Commit

Permalink
Revert "chardev: tcp: postpone TLS work until machine done"
Browse files Browse the repository at this point in the history
This reverts commit 99f2f54.

See next commit reverting 25679e5 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>
  • Loading branch information
elmarco authored and bonzini committed Oct 2, 2018
1 parent 1cd3d49 commit ded2bcd
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions chardev/char-socket.c
Expand Up @@ -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"

Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit ded2bcd

Please sign in to comment.