From nobody Mon Feb 9 16:47:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517859714254967.3807569027139; Mon, 5 Feb 2018 11:41:54 -0800 (PST) Received: from localhost ([::1]:54831 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eimeH-0007wn-DJ for importer@patchew.org; Mon, 05 Feb 2018 14:41:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eimS8-0004KM-8Z for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eimS5-0004u8-Fo for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:20 -0500 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:45168) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eimS5-0004ty-8N for qemu-devel@nongnu.org; Mon, 05 Feb 2018 14:29:17 -0500 Received: by mail-wr0-x241.google.com with SMTP id h9so17829663wre.12 for ; Mon, 05 Feb 2018 11:29:17 -0800 (PST) Received: from 640k.lan ([82.84.122.246]) by smtp.gmail.com with ESMTPSA id g8sm20029891wra.18.2018.02.05.11.29.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 11:29:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1ShQnaEkab7105rHvBPeWNxPe7p0HME/jk5v8iziPtY=; b=U+09lxng0vJmxSGmmx58C4KMQJ2HWfA9kIlfwxqdRz42KRjQKKbpltKvETp8wuPP7/ dio6pWuHsj7qw1/v/kawUO9aY1Sjp903mSTNTpwqR6N3dd5JTyD7VznHWqYv5eKiv00z RLhr13Z0jRfrUtrEUeQZ0ENguq4jHNhjdy6QiPptcAj5qj9cZar2JrNA2LNX48tlLRVY ZkPod3QvyqdLlLKLoIyvlu1c/dqKjhJwDtNbEbNVywNbI58kEGRU8Vp+nIdw0gYIgCs4 TCGlcXJk7fd7XiuSFAnc5LSEYtUm8CXHoCPmUxZ6sRb6bseKYJacQC8OZ7ri53m78TIs 4s7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1ShQnaEkab7105rHvBPeWNxPe7p0HME/jk5v8iziPtY=; b=FhDMvpIU+kQt8U+8IJEiLowRI6RXhVmghul7aGWYGa856p2CSDW2eofPyOllLS3Laz 7QcAFne7EFEOw5R3uVX6Xz3A79CAa4BXks9JbknYBYVqjcTGvNFIMqrz88aLV5fYO9AH bOq7qO6qwDVlE8sUpn514YdIGkjuz+CTgKcHmAR8kz3oFo1KdRHgDCZ8s19JtMiV1AQH BoAxzhj4jV12Sw9Xd0qSd2WbunegGfDJHKhFLtVlJVI+ijVxbC/7/Bnsv8xXXTCHVEn7 VFJOjSSx3CFFP2q/SWJ9fEfRQisKOQcmp+QnbusuMbIzdC6QIPdmnseZCHjw6An0lxSv FnCw== X-Gm-Message-State: AKwxytduzc7w9Y4UYWzGmMDAP3ZYsu7XIa3BF1i1KDdX6VAghb3SoHgR fZcdHHMy5zrrvRnZH0JshkUmMN2U X-Google-Smtp-Source: AH8x224J8mYdIvxSmpjkpB32NaX1LlCn9r9wNluIrtf+QNAxRThsiKFXs03ilnjHuw9RbWqXaWFtZg== X-Received: by 10.223.184.213 with SMTP id c21mr36355922wrg.57.1517858955859; Mon, 05 Feb 2018 11:29:15 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 5 Feb 2018 20:28:23 +0100 Message-Id: <1517858941-5538-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1517858941-5538-1-git-send-email-pbonzini@redhat.com> References: <1517858941-5538-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PULL 09/47] chardev: fix incorrect unref of source 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: Peter Xu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Peter Xu glib reported error when pty chardev used: $ ./qemu-system-x86_64 -chardev pty,id=3Dfoo -device isa-serial,chardev=3Df= oo qemu-system-x86_64: -chardev pty,id=3Dfoo: char device redirected to /dev/p= ts/2 (label foo) (qemu-system-x86_64:27885): GLib-CRITICAL **: g_source_unref: assertion 'so= urce !=3D NULL' failed (qemu-system-x86_64:27885): GLib-CRITICAL **: g_source_unref: assertion 'so= urce !=3D NULL' failed This patch fixes that. Fixes: 2c716ba150 ("chardev: introduce qemu_chr_timeout_add_ms()") CC: Paolo Bonzini Reported-by: Marc-Andr=C3=83=C2=A9 Lureau Signed-off-by: Peter Xu Message-Id: <20180118052049.31119-1-peterx@redhat.com> Signed-off-by: Paolo Bonzini --- chardev/char-pty.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/chardev/char-pty.c b/chardev/char-pty.c index 89315e6..68fd4e2 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -51,15 +51,32 @@ typedef struct { static void pty_chr_update_read_handler_locked(Chardev *chr); static void pty_chr_state(Chardev *chr, int connected); =20 +static void pty_chr_timer_cancel(PtyChardev *s) +{ + if (s->timer_src) { + g_source_destroy(s->timer_src); + g_source_unref(s->timer_src); + s->timer_src =3D NULL; + } +} + +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; + } +} + static gboolean pty_chr_timer(gpointer opaque) { struct Chardev *chr =3D CHARDEV(opaque); PtyChardev *s =3D PTY_CHARDEV(opaque); =20 qemu_mutex_lock(&chr->chr_write_lock); - s->timer_src =3D NULL; - g_source_unref(s->open_source); - s->open_source =3D NULL; + pty_chr_timer_cancel(s); + pty_chr_open_src_cancel(s); if (!s->connected) { /* Next poll ... */ pty_chr_update_read_handler_locked(chr); @@ -68,15 +85,6 @@ static gboolean pty_chr_timer(gpointer opaque) return FALSE; } =20 -static void pty_chr_timer_cancel(PtyChardev *s) -{ - if (s->timer_src) { - g_source_destroy(s->timer_src); - g_source_unref(s->timer_src); - s->timer_src =3D NULL; - } -} - /* Called with chr_write_lock held. */ static void pty_chr_rearm_timer(Chardev *chr, int ms) { @@ -195,11 +203,7 @@ static void pty_chr_state(Chardev *chr, int connected) PtyChardev *s =3D PTY_CHARDEV(chr); =20 if (!connected) { - if (s->open_source) { - g_source_destroy(s->open_source); - g_source_unref(s->open_source); - s->open_source =3D NULL; - } + pty_chr_open_src_cancel(s); remove_fd_in_watch(chr); s->connected =3D 0; /* (re-)connect poll interval for idle guests: once per second. --=20 1.8.3.1