From nobody Sun Dec 14 11:17:53 2025 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=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1764863019; cv=none; d=zohomail.com; s=zohoarc; b=iDM2hJLss0EI8OgD+LKH3XskiKqFPyHMk1p8v3i9MWJOTUgxyQobyYHqcDn+Zlw/r2d9KzaJpDs9T0zH1ZzFqHK1GnY0vNGEGsMdpDJrPYM6UKX37Tev02qXFPgtDDdaCVQS8+aSQ41sak3GcF+L/IYcB4j73SlpyUc42DM5iIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764863019; h=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=LUCSxr52Pv2huLa0fLn9hz38EO3fAzK11cfvmV1Zx1o=; b=P4Vv3erHsy2Y0QW1rY1vljlhH6DeLmCN9o77azHIdt8zcuoSfWVu2XPLS46vsCjrMLenCGq0W6EAlOFtmnvezpcD/u/4VzttCw+3gwbvLKHBTfk/S40GA3T/ln+vBrMy/cAZtHEhec0T8tBlz/hDrZlQ5XGOEXG8pjB1JxdWgD0= 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 1764863019517233.42679037720757; Thu, 4 Dec 2025 07:43:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vRBU4-0006VR-G1; Thu, 04 Dec 2025 10:43:08 -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 1vRBTp-0006SZ-F3 for qemu-devel@nongnu.org; Thu, 04 Dec 2025 10:42:55 -0500 Received: from forwardcorp1b.mail.yandex.net ([178.154.239.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vRBTl-0007FR-IL for qemu-devel@nongnu.org; Thu, 04 Dec 2025 10:42:51 -0500 Received: from mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net [IPv6:2a02:6b8:c24:fa2:0:640:41ee:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id A88EC808EF; Thu, 04 Dec 2025 18:42:47 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:83c::1:2e]) by mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id agnhnW0F9Gk0-wEtPrrgZ; Thu, 04 Dec 2025 18:42:47 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1764862967; bh=LUCSxr52Pv2huLa0fLn9hz38EO3fAzK11cfvmV1Zx1o=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=AFkc0JgxxZckYW90nKZz08Sle+cta5AXcoXHfOAWQhV0HZ68K+ZNdc9KSGkLWH7gT 37HMMYa/7cE8fi4SH1aWfd8sKrdL5g6xHCmlCFcEkVSjh8wBnbDfvONAmC3jn/kNZq zQYugDtgd79rWKG7U35DS/fCYJ3RnwV8AaB7wGig= Authentication-Results: mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: marcandre.lureau@redhat.com Cc: pbonzini@redhat.com, qemu-devel@nongnu.org, vsementsov@yandex-team.ru, d-tatianin@yandex-team.ru, Stefano Stabellini , Anthony PERARD , Paul Durrant , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org (open list:X86 Xen CPUs) Subject: [PATCH v2 08/10] chardev: introduce .chr_get_pty_name() handler Date: Thu, 4 Dec 2025 18:42:32 +0300 Message-ID: <20251204154235.149575-9-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251204154235.149575-1-vsementsov@yandex-team.ru> References: <20251204154235.149575-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 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=178.154.239.136; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1b.mail.yandex.net 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @yandex-team.ru) X-ZM-MESSAGEID: 1764863022762019200 Content-Type: text/plain; charset="utf-8" Currently we do two wrong things: 1. Abuse s->filename to get pty_name from it 2. Violate layering with help of CHARDEV_IS_PTY() Let's get rid of both, and introduce correct way to get pty name in generic code, if available. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Marc-Andr=C3=A9 Lureau --- chardev/char-pty.c | 7 +++++++ chardev/char.c | 19 +++++++++++++------ hw/char/xen_console.c | 7 ++++--- include/chardev/char.h | 7 +++++-- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/chardev/char-pty.c b/chardev/char-pty.c index a582aa7bc7..047aade09e 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -387,6 +387,12 @@ static void pty_chr_parse(QemuOpts *opts, ChardevBacke= nd *backend, Error **errp) pty->path =3D g_strdup(path); } =20 +static char *pty_chr_get_pty_name(Chardev *chr) +{ + PtyChardev *s =3D PTY_CHARDEV(chr); + return g_strdup(s->pty_name); +} + static void char_pty_class_init(ObjectClass *oc, const void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); @@ -396,6 +402,7 @@ static void char_pty_class_init(ObjectClass *oc, const = void *data) cc->chr_write =3D pty_chr_write; cc->chr_update_read_handler =3D pty_chr_update_read_handler; cc->chr_add_watch =3D pty_chr_add_watch; + cc->chr_get_pty_name =3D pty_chr_get_pty_name; } =20 static const TypeInfo char_pty_type_info =3D { diff --git a/chardev/char.c b/chardev/char.c index 44bfed3627..0dc792b88f 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -1090,9 +1090,7 @@ ChardevReturn *qmp_chardev_add(const char *id, Charde= vBackend *backend, } =20 ret =3D g_new0(ChardevReturn, 1); - if (CHARDEV_IS_PTY(chr)) { - ret->pty =3D g_strdup(chr->filename + 4); - } + ret->pty =3D qemu_chr_get_pty_name(chr); =20 return ret; =20 @@ -1101,6 +1099,17 @@ err: return NULL; } =20 +char *qemu_chr_get_pty_name(Chardev *chr) +{ + ChardevClass *cc =3D CHARDEV_GET_CLASS(chr); + + if (cc->chr_get_pty_name) { + return cc->chr_get_pty_name(chr); + } + + return NULL; +} + ChardevReturn *qmp_chardev_change(const char *id, ChardevBackend *backend, Error **errp) { @@ -1192,9 +1201,7 @@ ChardevReturn *qmp_chardev_change(const char *id, Cha= rdevBackend *backend, object_unref(OBJECT(chr_new)); =20 ret =3D g_new0(ChardevReturn, 1); - if (CHARDEV_IS_PTY(chr_new)) { - ret->pty =3D g_strdup(chr_new->filename + 4); - } + ret->pty =3D qemu_chr_get_pty_name(chr_new); =20 return ret; } diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index a639fb0b11..7502de46e4 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -418,6 +418,7 @@ static void xen_console_realize(XenDevice *xendev, Erro= r **errp) XenConsole *con =3D XEN_CONSOLE_DEVICE(xendev); Chardev *cs =3D qemu_chr_fe_get_driver(&con->chr); unsigned int u; + g_autofree char *pty_name =3D NULL; =20 if (!cs) { error_setg(errp, "no backing character device"); @@ -450,9 +451,9 @@ static void xen_console_realize(XenDevice *xendev, Erro= r **errp) =20 trace_xen_console_realize(con->dev, object_get_typename(OBJECT(cs))); =20 - if (CHARDEV_IS_PTY(cs)) { - /* Strip the leading 'pty:' */ - xen_device_frontend_printf(xendev, "tty", "%s", cs->filename + 4); + pty_name =3D qemu_chr_get_pty_name(cs); + if (pty_name) { + xen_device_frontend_printf(xendev, "tty", "%s", pty_name); } =20 /* No normal PV driver initialization for the primary console under Xe= n */ diff --git a/include/chardev/char.h b/include/chardev/char.h index 23a227dca9..d36e50b99e 100644 --- a/include/chardev/char.h +++ b/include/chardev/char.h @@ -247,8 +247,6 @@ OBJECT_DECLARE_TYPE(Chardev, ChardevClass, CHARDEV) =20 #define CHARDEV_IS_RINGBUF(chr) \ object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_RINGBUF) -#define CHARDEV_IS_PTY(chr) \ - object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_PTY) =20 struct ChardevClass { ObjectClass parent_class; @@ -306,6 +304,9 @@ struct ChardevClass { =20 /* handle various events */ void (*chr_be_event)(Chardev *s, QEMUChrEvent event); + + /* return PTY name if available */ + char *(*chr_get_pty_name)(Chardev *s); }; =20 Chardev *qemu_chardev_new(const char *id, const char *typename, @@ -320,4 +321,6 @@ GSource *qemu_chr_timeout_add_ms(Chardev *chr, guint ms, void suspend_mux_open(void); void resume_mux_open(void); =20 +char *qemu_chr_get_pty_name(Chardev *chr); + #endif --=20 2.48.1