From nobody Tue Oct 28 02:08:43 2025 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516113462302676.3688003049556; Tue, 16 Jan 2018 06:37:42 -0800 (PST) Received: from localhost ([::1]:39323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebSMv-0001qW-Fl for importer@patchew.org; Tue, 16 Jan 2018 09:37:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebS3l-0002i9-Nn for qemu-devel@nongnu.org; Tue, 16 Jan 2018 09:17:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebS3h-0004T5-Dw for qemu-devel@nongnu.org; Tue, 16 Jan 2018 09:17:53 -0500 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:39381) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ebS3h-0004SI-6x for qemu-devel@nongnu.org; Tue, 16 Jan 2018 09:17:49 -0500 Received: by mail-wr0-x241.google.com with SMTP id z48so15339664wrz.6 for ; Tue, 16 Jan 2018 06:17:49 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-229-84.clienti.tiscali.it. [78.12.229.84]) by smtp.gmail.com with ESMTPSA id u10sm1537758wrg.6.2018.01.16.06.17.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 06:17:47 -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; bh=XG1iRGuONMkY3+sT4JC6ibJ6XHtgTrqDRFZGOQkLmI0=; b=QQyqmvz0JD7GHaJr+4VboEGNOrPDDosY7Gwue4OgeI+Tb+mGlmQO53kNkuxNc+cYB3 JPivcgY/+0Mqrl0LOKqN0V39DDt5oYNRQRpcrGEGW86eL4IjO2sbEtQWyDr8nhlRWb9v JeQVBTIfneKpRoRouNrJE9g//ji2Fpx/4Fz3ITQGIcXe51wpuTL0oPEbLzUk/BV3vPgG gPXZhSrNgrOrVw8WIez6+Dly57vPSbv2a0SNj0oer3oXYQhvv0Oi9X1sKGKAMmDCQEd9 KfD6/MUfSeT6RvDP0CL8PnX1TXYUZsYZJuOCydlMfbA5iKv20NZBktXw92Puj1j5QSxv 06ow== 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; bh=XG1iRGuONMkY3+sT4JC6ibJ6XHtgTrqDRFZGOQkLmI0=; b=k01Csa/Knv17ZtoS+u5IHOquauwFcAxEUoKirkiDak1erGflgvEaG1cb7azhF5cQze +guzgZnfktdqdFuRsnLH+J2U1Q/ei4RwR6ZPzBg9gYW9C+KME5PQY9Zq0dNd1d4LECBA Fl3UwPh8wqQlFPCphksSItFGEA6ykIrkobcHrq4GItP+mZvXYznsWHoI7NvEXQf+tF5C CwYi1KStO2zSZnrthZHBFUlqD59hYIDncvAdFGLdBXIvM69Ha2G1H+LcJHa/Q+korx9c voskXwUCRlj/FRUhTu91l8DG9+t39/BAIeMq1W8pbvC7p3cdLxpRNUX9fngNEQsA5/m8 IXyQ== X-Gm-Message-State: AKGB3mIXf8FR8MwQfMDMoTs9LEmP54wVq2sIns0JACULYCvdABTjulU8 7XcQpvxFsK5KBA6eLIDpQaVScsPf X-Google-Smtp-Source: ACJfBosYtK3RWUz1SPg+CdTiCtUC1QqWE/wxmQGW9DPz7GqcIc2gvkRwxJeeBBOiIBv0mB3TvfN2Og== X-Received: by 10.223.199.205 with SMTP id y13mr26718346wrg.114.1516112267879; Tue, 16 Jan 2018 06:17:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Jan 2018 15:16:49 +0100 Message-Id: <1516112253-14480-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1516112253-14480-1-git-send-email-pbonzini@redhat.com> References: <1516112253-14480-1-git-send-email-pbonzini@redhat.com> 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 07/51] chardev: let g_idle_add() be with chardev gcontext 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 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peter Xu The idle task will be attached to main gcontext even if the chardev backend is running in another gcontext. Fix the only caller by extending the g_idle_add() logic into the more powerful g_source_attach(). It's basically g_idle_add_full() implementation, but with the chardev's gcontext passed in. Signed-off-by: Peter Xu Message-Id: <20180104141835.17987-3-peterx@redhat.com> Signed-off-by: Paolo Bonzini --- chardev/char-pty.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/chardev/char-pty.c b/chardev/char-pty.c index 761ae6d..8248e36 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -43,7 +43,7 @@ typedef struct { /* Protected by the Chardev chr_write_lock. */ int connected; guint timer_tag; - guint open_tag; + GSource *open_source; } PtyChardev; =20 #define PTY_CHARDEV(obj) OBJECT_CHECK(PtyChardev, (obj), TYPE_CHARDEV_PTY) @@ -58,7 +58,7 @@ static gboolean pty_chr_timer(gpointer opaque) =20 qemu_mutex_lock(&chr->chr_write_lock); s->timer_tag =3D 0; - s->open_tag =3D 0; + s->open_source =3D NULL; if (!s->connected) { /* Next poll ... */ pty_chr_update_read_handler_locked(chr); @@ -183,7 +183,7 @@ static gboolean qemu_chr_be_generic_open_func(gpointer = opaque) Chardev *chr =3D CHARDEV(opaque); PtyChardev *s =3D PTY_CHARDEV(opaque); =20 - s->open_tag =3D 0; + s->open_source =3D NULL; qemu_chr_be_event(chr, CHR_EVENT_OPENED); return FALSE; } @@ -194,9 +194,10 @@ static void pty_chr_state(Chardev *chr, int connected) PtyChardev *s =3D PTY_CHARDEV(chr); =20 if (!connected) { - if (s->open_tag) { - g_source_remove(s->open_tag); - s->open_tag =3D 0; + if (s->open_source) { + g_source_destroy(s->open_source); + g_source_unref(s->open_source); + s->open_source =3D NULL; } remove_fd_in_watch(chr); s->connected =3D 0; @@ -210,9 +211,13 @@ static void pty_chr_state(Chardev *chr, int connected) s->timer_tag =3D 0; } if (!s->connected) { - g_assert(s->open_tag =3D=3D 0); + g_assert(s->open_source =3D=3D NULL); + s->open_source =3D g_idle_source_new(); s->connected =3D 1; - s->open_tag =3D g_idle_add(qemu_chr_be_generic_open_func, chr); + g_source_set_callback(s->open_source, + qemu_chr_be_generic_open_func, + chr, NULL); + g_source_attach(s->open_source, chr->gcontext); } if (!chr->gsource) { chr->gsource =3D io_add_watch_poll(chr, s->ioc, --=20 1.8.3.1