From nobody Sun Apr 12 00:56:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772443479; cv=none; d=zohomail.com; s=zohoarc; b=ddx6AYACvG/tiqo2pauPvIg66gw7m1GiQF8ox/HiqXkVOMet8VsPW+gypfLQV0J5pcg8B78AxyRrEWRdkMBJOKFNzMfTlUjXdUiiiJXw9MBvYHf2bjo5KQv9gEQzTETkc60GxeWmkPHKszRTl5zKLnN+IwsOme674BXsd+CCK1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772443479; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=XvpDgdF204oqNvD9LAg+6U4IK6hUPz8IBO7coI28nAM=; b=lRF0/nhGEFaB7Kg6eQYkit/Nlm7fnnrqTLfqladj5eClwOwuHCU/RsF35NmoNd65aeWgVPgmgBOjP1v7d42NazWRFLjsVzSpcJ9+GAoirJtCYe5cZp9gYkYXkNRAVKKJeUwgMkza45zrMpW2+kZb5t/RhlwEY+SqC3p0msBY9AA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772443479005539.3438933938726; Mon, 2 Mar 2026 01:24:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vwzU8-0001Ly-Pw; Mon, 02 Mar 2026 04:22:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vwzU7-0001Kh-1C for qemu-devel@nongnu.org; Mon, 02 Mar 2026 04:22:39 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vwzU5-0007i0-8h for qemu-devel@nongnu.org; Mon, 02 Mar 2026 04:22:38 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-483bd7354efso57145575e9.2 for ; Mon, 02 Mar 2026 01:22:36 -0800 (PST) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-483bfb9d9c6sm129435305e9.14.2026.03.02.01.22.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2026 01:22:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772443355; x=1773048155; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XvpDgdF204oqNvD9LAg+6U4IK6hUPz8IBO7coI28nAM=; b=p1poQJtzZ53Wz/z5JhnBfLiyioRCICH7NRRfljHAYdbLSjkUklueh64j4YdG4uPbzJ IzupAVWj/XVfbuAd0IUc7nL+TTbhzK77gdAPOxMD9ixm6+R0hTlAA3nRFulqbTdBNT4p Vg4a855tXOld6pwYuK9Th8p+XqiCUXSBnnt+WO/R+QqIb3Tjul4SJg8/h8NInLo22/Hx kIj8bBE6yoEsK0x2epFB4i5s6plUMxuul8Ky4ZBUzLEmnPkBIec9tO+FMX88Zs3v0Cu+ aInFAS6vflWrW0kh/YejnyyT1wOyr2lq7eWj4rE8/3UUl5eq15WRSTrTpJlGkom+q9BD CaNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772443355; x=1773048155; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=XvpDgdF204oqNvD9LAg+6U4IK6hUPz8IBO7coI28nAM=; b=xCfb6gScpMXuL9auSjdaxRPaOdbEFh1wr1MpM/ALH16CqIjqDLrNb6/jXPxA7xle/B CmKxDIpKFRpF09d+FbUuj6PZIxJSGHJJl5VOx7ya/NSpZFUY79xzoe+fFP2RHbejHeMT JtxZzkTHsYv9wStZMJrqJo04a0/L5fy+MjxkDrSuONGzsyqus34nnGY8ZSqp2e4+WB3M 65wqnHciuaszeem7cZacRE7IpEjVycXPlrg6J0HeU2DHShedTjvl+r/s0t+i+6zrZ61c qEVeDhZPu4Wk4HBDHnIPZ6gX/5I5SM9NN02qnfOyMUkCHr3vT2pzpWJ8XPsDDQ0ENPL+ YhWw== X-Forwarded-Encrypted: i=1; AJvYcCX0DzJJM06V3lgxgFBsGY2HgyLijDS8kKrNMrtq9wnHyAqcnI02R+cF4MhwEqThvVt5V/HAC8ybBHgS@nongnu.org X-Gm-Message-State: AOJu0YyZVIqh839eLEkjPX8roQ5Ik+W31EFt7DB368LsuLbgs2UWQOgK rUia6KVxE5PStEPlXAgMkHfReLIalYopQ9MdVqBFVlVqU1EM396HidDlktyIAvnLWLk= X-Gm-Gg: ATEYQzxwVtYuCFg3Iv8MOOwybIeuvPQ9IcA5phRwnRSUOnZ8c9I2kHT7QcfxcAz9RUS QuoCIpdsXrhd7xcS/ryP2qdbIBUKoCEY0Erk8xvtZdCEexpf8XsTPSw7X6QBuq2UAYh6y+PSVer 47YmRE1PDv+YG1y4rV/aAr6B2So/ANVj6R3vJ95/edhhzeFzKITzKcwmWCAhXZ54jC9kPh1xcHw GL9RqHvuVYfQwfcEDscH+tYXNVcaodS93poTnuyW/ybvxOvRJYjEI81CEgy2uyiLyD0FRohaax8 neFL3nQVjSA+WCKVO9Ril/N76FF8Rd+7LjEnjm8CDc2P/whIYtM5xx4bSLXmYFduxLy60mr6y2F Q4wdUkQXdbcyHF6SCC3HST9p2nzsgv3eo8txJ/nIQiFRcUr/DTRuue/BO3lR+n2yRMs3eTcT5Wt 7VdxfBWlGmmqZO+qMI2ccsH/0fVZRTKCFomGV2GQ+hKYF1wWlmGm6rnJaQ3vqMLVsG4SlM9S4IJ tMnfG2qi+rjCjQ+KuaLQWLWpULs9M0= X-Received: by 2002:a05:600c:4e56:b0:477:5cc6:7e44 with SMTP id 5b1f17b1804b1-483c9b9eaddmr206430225e9.11.1772443355359; Mon, 02 Mar 2026 01:22:35 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Fabiano Rosas , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Alexander Bulekov , Stefan Hajnoczi , Darren Kenny , Qiuhao Li , Yodel Eldar , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PATCH v2 7/9] chardev: Consolidate yank registration Date: Mon, 2 Mar 2026 09:22:23 +0000 Message-ID: <20260302092225.4088227-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260302092225.4088227-1-peter.maydell@linaro.org> References: <20260302092225.4088227-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1772443479882158500 From: Fabiano Rosas There's currently five places where the yank function is being registered and they all come right before tcp_chr_new_client(). Fold them into it. Signed-off-by: Fabiano Rosas Reviewed-by: Daniel P. Berrang=C3=A9 [PMM: rebased] Signed-off-by: Peter Maydell --- chardev/char-socket.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 4e82915cf1..e064b105c5 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -905,6 +905,12 @@ static int tcp_chr_new_client(Chardev *chr, QIOChannel= Socket *sioc) s->sioc =3D sioc; object_ref(OBJECT(sioc)); =20 + if (s->registered_yank) { + yank_register_function(CHARDEV_YANK_INSTANCE(chr->label), + char_socket_yank_iochannel, + QIO_CHANNEL(sioc)); + } + if (s->do_nodelay) { qio_channel_set_delay(s->ioc, false); } @@ -943,11 +949,6 @@ static int tcp_chr_add_client(Chardev *chr, int fd) } tcp_chr_change_state(s, TCP_CHARDEV_STATE_CONNECTING); tcp_chr_set_client_ioc_name(chr, sioc); - if (s->registered_yank) { - yank_register_function(CHARDEV_YANK_INSTANCE(chr->label), - char_socket_yank_iochannel, - QIO_CHANNEL(sioc)); - } ret =3D tcp_chr_new_client(chr, sioc); object_unref(OBJECT(sioc)); return ret; @@ -962,11 +963,6 @@ static void tcp_chr_accept(QIONetListener *listener, =20 tcp_chr_change_state(s, TCP_CHARDEV_STATE_CONNECTING); tcp_chr_set_client_ioc_name(chr, cioc); - if (s->registered_yank) { - yank_register_function(CHARDEV_YANK_INSTANCE(chr->label), - char_socket_yank_iochannel, - QIO_CHANNEL(cioc)); - } tcp_chr_new_client(chr, cioc); } =20 @@ -982,11 +978,6 @@ static int tcp_chr_connect_client_sync(Chardev *chr, E= rror **errp) object_unref(OBJECT(sioc)); return -1; } - if (s->registered_yank) { - yank_register_function(CHARDEV_YANK_INSTANCE(chr->label), - char_socket_yank_iochannel, - QIO_CHANNEL(sioc)); - } tcp_chr_new_client(chr, sioc); object_unref(OBJECT(sioc)); return 0; @@ -1002,11 +993,6 @@ static void tcp_chr_accept_server_sync(Chardev *chr) tcp_chr_change_state(s, TCP_CHARDEV_STATE_CONNECTING); sioc =3D qio_net_listener_wait_client(s->listener); tcp_chr_set_client_ioc_name(chr, sioc); - if (s->registered_yank) { - yank_register_function(CHARDEV_YANK_INSTANCE(chr->label), - char_socket_yank_iochannel, - QIO_CHANNEL(sioc)); - } tcp_chr_new_client(chr, sioc); object_unref(OBJECT(sioc)); } @@ -1180,11 +1166,6 @@ static void tcp_chr_connect_client_async(Chardev *ch= r) tcp_chr_change_state(s, TCP_CHARDEV_STATE_CONNECTING); sioc =3D qio_channel_socket_new(); tcp_chr_set_client_ioc_name(chr, sioc); - if (s->registered_yank) { - yank_register_function(CHARDEV_YANK_INSTANCE(chr->label), - char_socket_yank_iochannel, - QIO_CHANNEL(sioc)); - } /* * Normally code would use the qio_channel_socket_connect_async * method which uses a QIOTask + qio_task_set_error internally --=20 2.43.0