From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1esjxv-0007kf-JH for qemu-devel@nongnu.org; Mon, 05 Mar 2018 01:51:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1esjxr-0001eF-MN for qemu-devel@nongnu.org; Mon, 05 Mar 2018 01:51:19 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:53498 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1esjxr-0001e0-HM for qemu-devel@nongnu.org; Mon, 05 Mar 2018 01:51:15 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1302140FB65A for ; Mon, 5 Mar 2018 06:51:15 +0000 (UTC) From: Peter Xu Date: Mon, 5 Mar 2018 14:50:40 +0800 Message-Id: <20180305065040.10353-10-peterx@redhat.com> In-Reply-To: <20180305065040.10353-1-peterx@redhat.com> References: <20180305065040.10353-1-peterx@redhat.com> Subject: [Qemu-devel] [PATCH 9/9] chardev: tcp: postpone TLS work until machine done List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Stefan Hajnoczi , "Daniel P . Berrange" , peterx@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= 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 --- 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