From nobody Wed Feb 11 05:35:50 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506037432452653.5581119256167; Thu, 21 Sep 2017 16:43:52 -0700 (PDT) Received: from localhost ([::1]:55978 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvB8J-0002ut-MG for importer@patchew.org; Thu, 21 Sep 2017 19:43:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvAih-0005Aq-9C for qemu-devel@nongnu.org; Thu, 21 Sep 2017 19:17:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvAig-0004hg-AK for qemu-devel@nongnu.org; Thu, 21 Sep 2017 19:17:23 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:37511) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvAif-0004gU-Vw for qemu-devel@nongnu.org; Thu, 21 Sep 2017 19:17:22 -0400 Received: by mail-wr0-x241.google.com with SMTP id u48so3841190wrf.4 for ; Thu, 21 Sep 2017 16:17:21 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-246-117.clienti.tiscali.it. [78.12.246.117]) by smtp.gmail.com with ESMTPSA id u186sm2596278wmd.19.2017.09.21.16.17.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 16:17:20 -0700 (PDT) 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=xcero3ihLOzDLAQV1ORyAN0r/YOiiaoHJKKKY9XUKQQ=; b=Wm5XrQivnG5ubkgPtPn9QcrmlVSB0ozMbCVlelfbJv1X0nzr4DqSzW1LsqJbkvNhxR 9xKNHfA4ho6z0apbjQHb17BzKrLN+oLpeGjcGZWa3V+hTyqn5kVwFJlsMzJVhvaSxPgr 4y/tgu1yANRAtW5mEWNKfoPy3APvnLisRwodvWw/14xDNrpxqNOP1VVZNqmt7iu7pxsF mD7IE0MtVOvoac7uohc2GybGmnBktJYRM/N+1D4iEf6rh0JYCTjfmV6Gj3bd/WYrmTu6 pO7xGmPZ5tZh+ebSao74Cs16AZS52XYTqmGiZgm0RelReBT568C2ak8ZadIaMtjaGWzj Smxw== 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=xcero3ihLOzDLAQV1ORyAN0r/YOiiaoHJKKKY9XUKQQ=; b=YMradGLU5kTJ5dNek0lAkkR5OPBvevO5K4qI5BAjqeTYXK5ZigChpqI4wP6rmZUpQH AWKeq2oWOoDYTNOfNZq15UC+bjSN3DF/NkDj2qacDOnKBnR1S6H5pDGy5xDC4SQKppH4 ijKy5n5gKj4RHAqdRR+b1ja/IKxZKrTRk/XZ/WbL73GeBLQQ3TbnLr6vqx82yUD8PUpI 5tm8JpIsJV1uCiEoni5IM9DKyvuXqJxN3Zp3GKLr488SfLt+BaNex2jJoJZvH3LiVK0v mnRyvdKAuTTPC54oqLXaciuIZnLx0nbae0WOkEPDoxu4cnUkfrNoZ318MXnj99wFVpK7 GtiQ== X-Gm-Message-State: AHPjjUihoCW+nyp93MqekAWjLVh7nFG0hhSW8OKLz3VfyUu/SgM05+WF 8UX24U88cuy1eowQ4yVoyir1yBKD X-Google-Smtp-Source: AOwi7QDeGl704up9v/9F5UJdyIGM3Csxsw0e1XozxuRKgXgt3INMZ3AafFXFqOLRKlSDrUtCkPQOqg== X-Received: by 10.223.128.137 with SMTP id 9mr3086300wrl.235.1506035840742; Thu, 21 Sep 2017 16:17:20 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 22 Sep 2017 01:16:39 +0200 Message-Id: <1506035800-30509-32-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1506035800-30509-1-git-send-email-pbonzini@redhat.com> References: <1506035800-30509-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 31/32] chardev: use per-dev context for io_add_watch_poll 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 It was only passed in by chr_update_read_handlers(). However when reconnect, we'll lose that context information. So if a chardev was running on another context (rather than the default context, the NULL pointer), it'll switch back to the default context if reconnection happens. But, it should really stick to the old context. Convert all the callers of io_add_watch_poll() to use the internally cached gcontext. Then the context should be able to survive even after reconnections. Signed-off-by: Peter Xu Message-Id: <1505975754-21555-4-git-send-email-peterx@redhat.com> Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- chardev/char-fd.c | 2 +- chardev/char-pty.c | 2 +- chardev/char-socket.c | 4 ++-- chardev/char-udp.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chardev/char-fd.c b/chardev/char-fd.c index 6a62a54..09fbb07 100644 --- a/chardev/char-fd.c +++ b/chardev/char-fd.c @@ -94,7 +94,7 @@ static void fd_chr_update_read_handler(Chardev *chr, chr->gsource =3D io_add_watch_poll(chr, s->ioc_in, fd_chr_read_poll, fd_chr_read, chr, - context); + chr->gcontext); } } =20 diff --git a/chardev/char-pty.c b/chardev/char-pty.c index e5d20a0..d239c04 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -219,7 +219,7 @@ static void pty_chr_state(Chardev *chr, int connected) chr->gsource =3D io_add_watch_poll(chr, s->ioc, pty_chr_read_poll, pty_chr_read, - chr, NULL); + chr, chr->gcontext); } } } diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 1ae730a..ee71cbe 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -516,7 +516,7 @@ static void tcp_chr_connect(void *opaque) chr->gsource =3D io_add_watch_poll(chr, s->ioc, tcp_chr_read_poll, tcp_chr_read, - chr, NULL); + chr, chr->gcontext); } qemu_chr_be_event(chr, CHR_EVENT_OPENED); } @@ -535,7 +535,7 @@ static void tcp_chr_update_read_handler(Chardev *chr, chr->gsource =3D io_add_watch_poll(chr, s->ioc, tcp_chr_read_poll, tcp_chr_read, chr, - context); + chr->gcontext); } } =20 diff --git a/chardev/char-udp.c b/chardev/char-udp.c index 4ee11d3..106dee1 100644 --- a/chardev/char-udp.c +++ b/chardev/char-udp.c @@ -110,7 +110,7 @@ static void udp_chr_update_read_handler(Chardev *chr, chr->gsource =3D io_add_watch_poll(chr, s->ioc, udp_chr_read_poll, udp_chr_read, chr, - context); + chr->gcontext); } } =20 --=20 1.8.3.1