From nobody Sun Dec 14 11:17:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1764423916; cv=none; d=zohomail.com; s=zohoarc; b=PAKllAWhz84CqNhfEWWS4rFctA1aWCO6zdDbHf+kOv0avdnIns71x4urhnfahnhTKE4WuwY6JKwKdUBjKHUKmkBWpuiys1nrHe6q2ArzKFsDVrdImk8OuhfhbqNd8+OMxsdh3cpN21pVO4QApNRd96xgQlF8tbNOwx0AbW8zfS8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764423916; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LUCSxr52Pv2huLa0fLn9hz38EO3fAzK11cfvmV1Zx1o=; b=JXOhfMSYC+S0MbkXVMQINNCBo6VDtJPDmjmMSTT0ab1TjHS8uTKgwLX48xls5lIiiruw8JE2F2v3oa2/dsDfyJ10qNSQNZMU/Kpjkm6IR1WV10X3pXEZv9taaMoSqXdd4ZCq/ZZ3Hwf9duGnsxtxIDOvIASzZU/Vjl5mdOF7Kw8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1764423916582616.0057466453131; Sat, 29 Nov 2025 05:45:16 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1175230.1500077 (Exim 4.92) (envelope-from ) id 1vPLFb-0003mA-28; Sat, 29 Nov 2025 13:44:35 +0000 Received: by outflank-mailman (output) from mailman id 1175230.1500077; Sat, 29 Nov 2025 13:44:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vPLFa-0003m2-Sn; Sat, 29 Nov 2025 13:44:34 +0000 Received: by outflank-mailman (input) for mailman id 1175230; Sat, 29 Nov 2025 13:44:33 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vPLFY-0003lw-In for xen-devel@lists.xenproject.org; Sat, 29 Nov 2025 13:44:33 +0000 Received: from forwardcorp1d.mail.yandex.net (forwardcorp1d.mail.yandex.net [178.154.239.200]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 879beefc-cd29-11f0-9d18-b5c5bf9af7f9; Sat, 29 Nov 2025 14:44:30 +0100 (CET) Received: from mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net [IPv6:2a02:6b8:c42:65a0:0:640:e1de:0]) by forwardcorp1d.mail.yandex.net (Yandex) with ESMTPS id 7BD36807C8; Sat, 29 Nov 2025 16:44:28 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:891::1:b]) by mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id Iigm2k0FK8c0-ulXpjbz3; Sat, 29 Nov 2025 16:44:27 +0300 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 879beefc-cd29-11f0-9d18-b5c5bf9af7f9 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1764423867; bh=LUCSxr52Pv2huLa0fLn9hz38EO3fAzK11cfvmV1Zx1o=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=fnN1kUpbAUIbmVpr8z4hs3eb95QPfQMSIrmtOiUfZcBCqWBA53ree1f+qm7BDIGff GMBZkItq/iHyjYMaL7UtmTwwYoW8yuJUp3W2DRqd8uy9x/L4gaQqJ6+Zf7xVuAm7rA gBJeWp/iea8yhHtgJbTB0ze8yFT+wdli48WJX+qo= Authentication-Results: mail-nwsmtp-smtp-corp-main-56.klg.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 6/8] chardev: introduce .chr_get_pty_name() handler Date: Sat, 29 Nov 2025 16:43:46 +0300 Message-ID: <20251129134350.487839-7-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251129134350.487839-1-vsementsov@yandex-team.ru> References: <20251129134350.487839-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1764423919370019200 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 --- 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