From nobody Sat Apr 20 13:46:09 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549545956495495.9087353017917; Thu, 7 Feb 2019 05:25:56 -0800 (PST) Received: from localhost ([127.0.0.1]:40021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grjgV-00025Z-EJ for importer@patchew.org; Thu, 07 Feb 2019 08:25:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grjeu-0001Dq-PI for qemu-devel@nongnu.org; Thu, 07 Feb 2019 08:24:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grjeu-0004Bg-58 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 08:24:04 -0500 Received: from fanzine.igalia.com ([91.117.99.155]:59535) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grjet-000405-Jo for qemu-devel@nongnu.org; Thu, 07 Feb 2019 08:24:04 -0500 Received: from 62-165-147-230.co.dnainternet.fi ([62.165.147.230] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1grjeX-0003gm-Oh; Thu, 07 Feb 2019 14:23:41 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1grjeK-0003A3-OI; Thu, 07 Feb 2019 15:23:28 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=4Q/+KF3PsMLpta38XReChATNDisWRfPvD05uJXO9Zic=; b=qYU04SU3KbOjsUpnSpqlLr81YUa6vieRMt125yQbmxPu+4x+/2SaL02/1hWZUodDvWoO7j6E8hOZxAXYijjqCvUO4x1YyMKd8zMwF+JfgIjA4H+1MQzy41wEjnUtaPkhb9GD24Muyp/5aUHRNhqp/rVCBd6UUdubnJ09dnB+xjUvVL7WfsdU3GM8UrUpOuaE9fBhJayNICAjfbmBp84cxh9hiECRaJK6eHNgryt2zx4FUcGEtS4MHwvu4N8gAv0uzba1qdAhMgqzDFlwFGOr6/wMy5UHsJRM8WYUVyw9sM1L8tGHSzwVGssce0GpGZ6TxtD1vEUAYSJpFcKJ4azv9A==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 15:23:21 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH 1/3] main-loop: Don't leak GSources attached to a GMainContext X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Alberto Garcia , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" After g_source_attach() the GMainContext holds a reference to the GSource, so the caller does not need to keep it. pty_chr_state() and qio_task_thread_worker() are not doing this, so the GSource is being leaked in both cases (pty_chr_open_src_cancel() is the exception here because it does remove the extra reference correctly). Signed-off-by: Alberto Garcia Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- chardev/char-pty.c | 2 +- io/task.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/chardev/char-pty.c b/chardev/char-pty.c index f681d637c1..f16a5e8d59 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -60,7 +60,6 @@ static void pty_chr_open_src_cancel(PtyChardev *s) { if (s->open_source) { g_source_destroy(s->open_source); - g_source_unref(s->open_source); s->open_source =3D NULL; } } @@ -216,6 +215,7 @@ static void pty_chr_state(Chardev *chr, int connected) qemu_chr_be_generic_open_func, chr, NULL); g_source_attach(s->open_source, chr->gcontext); + g_source_unref(s->open_source); } if (!chr->gsource) { chr->gsource =3D io_add_watch_poll(chr, s->ioc, diff --git a/io/task.c b/io/task.c index 2886a2c1bc..c8489fb790 100644 --- a/io/task.c +++ b/io/task.c @@ -120,6 +120,7 @@ static gpointer qio_task_thread_worker(gpointer opaque) idle =3D g_idle_source_new(); g_source_set_callback(idle, qio_task_thread_result, data, NULL); g_source_attach(idle, data->context); + g_source_unref(idle); =20 return NULL; } --=20 2.11.0 From nobody Sat Apr 20 13:46:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549546082364207.55297057049415; Thu, 7 Feb 2019 05:28:02 -0800 (PST) Received: from localhost ([127.0.0.1]:40044 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grjih-0003sf-Bw for importer@patchew.org; Thu, 07 Feb 2019 08:27:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grjf6-0001Oo-R5 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 08:24:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grjex-0004Dw-GE for qemu-devel@nongnu.org; Thu, 07 Feb 2019 08:24:16 -0500 Received: from fanzine.igalia.com ([91.117.99.155]:59534) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grjex-000403-7c for qemu-devel@nongnu.org; Thu, 07 Feb 2019 08:24:07 -0500 Received: from 62-165-147-230.co.dnainternet.fi ([62.165.147.230] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1grjeX-0003gn-Mv; Thu, 07 Feb 2019 14:23:41 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1grjeK-0003A6-PQ; Thu, 07 Feb 2019 15:23:28 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=LPC4W1xvbkiZRcMeKOH76wLQbwsRSf7ZlKa7CN0WuKs=; b=sQx988t48GE2iZB3ooBPf5euhWVd3dOC6DTB1WNtIhIiEFpnkUzCgpiTQMPG2IAKtaiOvwUr0TGMYTAILuNDV9LOjF3Eg8AmqgDrqE5aRL5Li8MkDIHcXBLpyhFluEo4KQLwg4UInSmsHiU8BmGr64lsDF3X0J602M5bm+kBfDJlbaKPwwbJjO6RpIoWeuTiGVRSmsI3cFuYDemAjWh775XHgrB3U8mpneOYTGi5V+fjOs9CZoWCF/WY9G8tvhTzRhKg/keOXrHKtx8Qb6PoSUZETsGOHpSXrVmQNmhxZJ5BZmO0bofXLeKS10YhlJfnzzBxyhCxaI7XQNbdCLifFQ==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 15:23:22 +0200 Message-Id: <2c1d9d03c5b3ee26b116db3438caa3df73dffa46.1549545591.git.berto@igalia.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH 2/3] main-loop: Add qemu_idle_add() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Alberto Garcia , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This works like g_idle_add() but allows specifying a different GMainContext. It also returns the GSource directly instead of its ID number for convenience. pty_chr_state() and qio_task_thread_worker() are modified to make use of this new function. Signed-off-by: Alberto Garcia Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- chardev/char-pty.c | 8 ++------ include/qemu/main-loop.h | 8 ++++++++ io/task.c | 7 ++----- util/main-loop.c | 9 +++++++++ 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/chardev/char-pty.c b/chardev/char-pty.c index f16a5e8d59..6562c38f39 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -209,13 +209,9 @@ static void pty_chr_state(Chardev *chr, int connected) pty_chr_timer_cancel(s); if (!s->connected) { g_assert(s->open_source =3D=3D NULL); - s->open_source =3D g_idle_source_new(); + s->open_source =3D qemu_idle_add(qemu_chr_be_generic_open_func, + chr, chr->gcontext); s->connected =3D 1; - g_source_set_callback(s->open_source, - qemu_chr_be_generic_open_func, - chr, NULL); - g_source_attach(s->open_source, chr->gcontext); - g_source_unref(s->open_source); } if (!chr->gsource) { chr->gsource =3D io_add_watch_poll(chr, s->ioc, diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h index e59f9ae1e9..1865afd993 100644 --- a/include/qemu/main-loop.h +++ b/include/qemu/main-loop.h @@ -295,6 +295,14 @@ void qemu_mutex_lock_iothread_impl(const char *file, i= nt line); */ void qemu_mutex_unlock_iothread(void); =20 +/** + * qemu_idle_add: Add an idle function to a GMainContext + * + * This function is similar to GLib's g_idle_add() but it allows + * specifying a GMainContext instead of using the global one. + */ +GSource *qemu_idle_add(GSourceFunc func, gpointer data, GMainContext *ctx); + /* internal interfaces */ =20 void qemu_fd_register(int fd); diff --git a/io/task.c b/io/task.c index c8489fb790..bdd395b0ad 100644 --- a/io/task.c +++ b/io/task.c @@ -19,6 +19,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/main-loop.h" #include "io/task.h" #include "qapi/error.h" #include "qemu/thread.h" @@ -105,7 +106,6 @@ static gboolean qio_task_thread_result(gpointer opaque) static gpointer qio_task_thread_worker(gpointer opaque) { struct QIOTaskThreadData *data =3D opaque; - GSource *idle; =20 trace_qio_task_thread_run(data->task); data->worker(data->task, data->opaque); @@ -117,10 +117,7 @@ static gpointer qio_task_thread_worker(gpointer opaque) */ trace_qio_task_thread_exit(data->task); =20 - idle =3D g_idle_source_new(); - g_source_set_callback(idle, qio_task_thread_result, data, NULL); - g_source_attach(idle, data->context); - g_source_unref(idle); + qemu_idle_add(qio_task_thread_result, data, data->context); =20 return NULL; } diff --git a/util/main-loop.c b/util/main-loop.c index 443cb4cfe8..1c68e3bf5f 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -171,6 +171,15 @@ int qemu_init_main_loop(Error **errp) return 0; } =20 +GSource *qemu_idle_add(GSourceFunc func, gpointer data, GMainContext *ctx) +{ + GSource *idle =3D g_idle_source_new(); + g_source_set_callback(idle, func, data, NULL); + g_source_attach(idle, ctx); + g_source_unref(idle); + return idle; +} + static int max_priority; =20 #ifndef _WIN32 --=20 2.11.0 From nobody Sat Apr 20 13:46:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549545965600859.3726986292609; Thu, 7 Feb 2019 05:26:05 -0800 (PST) Received: from localhost ([127.0.0.1]:40029 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grjgl-0002MO-ID for importer@patchew.org; Thu, 07 Feb 2019 08:25:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49439) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grjf4-0001MA-Pg for qemu-devel@nongnu.org; Thu, 07 Feb 2019 08:24:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grjev-0004Ct-Gn for qemu-devel@nongnu.org; Thu, 07 Feb 2019 08:24:12 -0500 Received: from fanzine.igalia.com ([91.117.99.155]:59537) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grjev-000404-5G for qemu-devel@nongnu.org; Thu, 07 Feb 2019 08:24:05 -0500 Received: from 62-165-147-230.co.dnainternet.fi ([62.165.147.230] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1grjeX-0003go-Ok; Thu, 07 Feb 2019 14:23:41 +0100 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1grjeK-0003A9-Qd; Thu, 07 Feb 2019 15:23:28 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=tKdJ3Yw+VRrqxSR5azZKKrv1gJGi17deMzmQQD+tB7A=; b=maHtm52fVd4WqdrU5eIKR1Bc6lEMaAvzWJkeKkWJ72IYA3rHG7zFxKBnW/ow+AfgE+DDJ8XfJ2oKnvPH+CMXGJPpl9I8xma6UXpmjTA1h7yM5R2y5f5LzcU/g7ssIR9vHP1JBC8wrmEDXbaAzc/oMkyAxDDE7iJWj12TroHtbfKtP6K+MDhyBMcg1LMl+kgT+JBCC/mqIhJr83xB0bSEARsfmq9r5GM8dSnv1szR4XHzW88thmo3U+yKFQ3uO8ixQ0d36tyCA2hw7ndoofBdsBxVXe3zog6NZAHVQOcEbCjtLYweMDMkdk8DiFknxXxNwrxgyXiQRvmV0uID5GE9rQ==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 15:23:23 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH 3/3] char-socket: Lock tcp_chr_disconnect() and socket_reconnect_timeout() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Alberto Garcia , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There's a race condition in which the tcp_chr_read() ioc handler can close a connection that is being written to from another thread. Running iotest 136 in a loop triggers this problem and crashes QEMU. (gdb) bt #0 0x00005558b842902d in object_get_class (obj=3D0x0) at qom/object.c:860 #1 0x00005558b84f92db in qio_channel_writev_full (ioc=3D0x0, iov=3D0x7ffc= 355decf0, niov=3D1, fds=3D0x0, nfds=3D0, errp=3D0x0) at io/channel.c:76 #2 0x00005558b84e0e9e in io_channel_send_full (ioc=3D0x0, buf=3D0x5558baf= 5beb0, len=3D138, fds=3D0x0, nfds=3D0) at chardev/char-io.c:123 #3 0x00005558b84e4a69 in tcp_chr_write (chr=3D0x5558ba460380, buf=3D0x555= 8baf5beb0 "...", len=3D138) at chardev/char-socket.c:135 #4 0x00005558b84dca55 in qemu_chr_write_buffer (s=3D0x5558ba460380, buf= =3D0x5558baf5beb0 "...", len=3D138, offset=3D0x7ffc355dedd0, write_all=3Dfa= lse) at chardev/char.c:112 #5 0x00005558b84dcbc2 in qemu_chr_write (s=3D0x5558ba460380, buf=3D0x5558= baf5beb0 "...", len=3D138, write_all=3Dfalse) at chardev/char.c:147 #6 0x00005558b84dfb26 in qemu_chr_fe_write (be=3D0x5558ba476610, buf=3D0x= 5558baf5beb0 "...", len=3D138) at chardev/char-fe.c:42 #7 0x00005558b8088c86 in monitor_flush_locked (mon=3D0x5558ba476610) at m= onitor.c:406 #8 0x00005558b8088e8c in monitor_puts (mon=3D0x5558ba476610, str=3D0x5558= ba921e49 "") at monitor.c:449 #9 0x00005558b8089178 in qmp_send_response (mon=3D0x5558ba476610, rsp=3D0= x5558bb161600) at monitor.c:498 #10 0x00005558b808920c in monitor_qapi_event_emit (event=3DQAPI_EVENT_SHUT= DOWN, qdict=3D0x5558bb161600) at monitor.c:526 #11 0x00005558b8089307 in monitor_qapi_event_queue_no_reenter (event=3DQAP= I_EVENT_SHUTDOWN, qdict=3D0x5558bb161600) at monitor.c:551 #12 0x00005558b80896c0 in qapi_event_emit (event=3DQAPI_EVENT_SHUTDOWN, qd= ict=3D0x5558bb161600) at monitor.c:626 #13 0x00005558b855f23b in qapi_event_send_shutdown (guest=3Dfalse, reason= =3DSHUTDOWN_CAUSE_HOST_QMP_QUIT) at qapi/qapi-events-run-state.c:43 #14 0x00005558b81911ef in qemu_system_shutdown (cause=3DSHUTDOWN_CAUSE_HOS= T_QMP_QUIT) at vl.c:1837 #15 0x00005558b8191308 in main_loop_should_exit () at vl.c:1885 #16 0x00005558b819140d in main_loop () at vl.c:1924 #17 0x00005558b8198c84 in main (argc=3D18, argv=3D0x7ffc355df3f8, envp=3D0= x7ffc355df490) at vl.c:4665 This patch adds a lock to protect tcp_chr_disconnect() and socket_reconnect_timeout() Signed-off-by: Alberto Garcia --- chardev/char-socket.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index eaa8e8b68f..5f421bdc58 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -148,7 +148,9 @@ static int tcp_chr_write(Chardev *chr, const uint8_t *b= uf, int len) =20 if (ret < 0 && errno !=3D EAGAIN) { if (tcp_chr_read_poll(chr) <=3D 0) { + qemu_mutex_unlock(&chr->chr_write_lock); tcp_chr_disconnect(chr); + qemu_mutex_lock(&chr->chr_write_lock); return len; } /* else let the read handler finish it properly */ } @@ -440,6 +442,13 @@ static void update_disconnected_filename(SocketChardev= *s) } } =20 +static gboolean tcp_chr_be_event_closed(gpointer opaque) +{ + Chardev *chr =3D opaque; + qemu_chr_be_event(chr, CHR_EVENT_CLOSED); + return FALSE; +} + /* NB may be called even if tcp_chr_connect has not been * reached, due to TLS or telnet initialization failure, * so can *not* assume s->connected =3D=3D true @@ -447,7 +456,10 @@ static void update_disconnected_filename(SocketChardev= *s) static void tcp_chr_disconnect(Chardev *chr) { SocketChardev *s =3D SOCKET_CHARDEV(chr); - bool emit_close =3D s->connected; + bool emit_close; + + qemu_mutex_lock(&chr->chr_write_lock); + emit_close =3D s->connected; =20 tcp_chr_free_connection(chr); =20 @@ -457,11 +469,12 @@ static void tcp_chr_disconnect(Chardev *chr) } update_disconnected_filename(s); if (emit_close) { - qemu_chr_be_event(chr, CHR_EVENT_CLOSED); + qemu_idle_add(tcp_chr_be_event_closed, chr, chr->gcontext); } if (s->reconnect_time) { qemu_chr_socket_restart_timer(chr); } + qemu_mutex_unlock(&chr->chr_write_lock); } =20 static gboolean tcp_chr_read(QIOChannel *chan, GIOCondition cond, void *op= aque) @@ -975,8 +988,10 @@ static gboolean socket_reconnect_timeout(gpointer opaq= ue) Chardev *chr =3D CHARDEV(opaque); SocketChardev *s =3D SOCKET_CHARDEV(opaque); =20 + qemu_mutex_lock(&chr->chr_write_lock); g_source_unref(s->reconnect_timer); s->reconnect_timer =3D NULL; + qemu_mutex_unlock(&chr->chr_write_lock); =20 if (chr->be_open) { return false; --=20 2.11.0