From nobody Sun Dec 14 11:17:51 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=1764423939; cv=none; d=zohomail.com; s=zohoarc; b=Gq+yJKiUKdwRk3+eCWAGewYvyhbqg2hteC13lhD3qjKjc0u7rAUSLw/nvrGqlaHzFdNWTqn6XLGZ9REp9VRnTIb1r53yc/Kf5fmsHvZLMraL4aCNw1FFBM3ClhKrQhNt+dfbAxedawfdRryBLXlb4cHxYgRGddmjXxbq8ta3VWU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764423939; 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=CL6qFPwQoeSNpg/HvJgiM8hNjV5gKvEi8vUGkDkQQc4=; b=bD/HqSDJGH15N/4D+ZUehLszJUrf+paGBx9xhYqSlAgWKhPc+XIg0m9ONTYiEF71+19b7JP5vgM7JVX7aepDe2tix21+4dRHyE0EJI1SpS4P5wiYspm4gmf6bJr5A74/0UE8CuF5B6UD7/bAv14hlfdnjVaweQ7/o4uQBoldGvs= 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 1764423939342764.4306782322151; Sat, 29 Nov 2025 05:45:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vPLFl-0005QS-H0; Sat, 29 Nov 2025 08:44:45 -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 1vPLFZ-0005OL-Iw for qemu-devel@nongnu.org; Sat, 29 Nov 2025 08:44:34 -0500 Received: from forwardcorp1d.mail.yandex.net ([178.154.239.200]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vPLFW-0002Yb-DH for qemu-devel@nongnu.org; Sat, 29 Nov 2025 08:44:32 -0500 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 23EE08084E; Sat, 29 Nov 2025 16:44:29 +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-THaXbO3L; Sat, 29 Nov 2025 16:44:28 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1764423868; bh=CL6qFPwQoeSNpg/HvJgiM8hNjV5gKvEi8vUGkDkQQc4=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=Ksah5/JNgU6NuaZe0f++8NSGcV+mrjt6EmWrSq0kmPcIlMdkcgcXuNUjnXki2mgRW ti6NG0xh3O687q87cTrBUBNT3aYaNYM+mKWqzqeqTIWmeNAneVYeADjdXl6nx5YHQk AHgVehZl7x4EkRC2qv/t1iRTHxX9xWgW3+JWOkCc= 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 Subject: [PATCH 7/8] chardev: rework filename handling Date: Sat, 29 Nov 2025 16:43:47 +0300 Message-ID: <20251129134350.487839-8-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 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.200; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1d.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: 1764423940313019200 Content-Type: text/plain; charset="utf-8" We have the following flaws with it: 1. Layring violation by modifying generic state directly in backends 2. Tricky generic logic: we should check, did backend set the generic state field, and fill it when not. Let's fix them all by making filename a private field with getter and setter. And move the "default logic" into getter. Signed-off-by: Vladimir Sementsov-Ogievskiy --- chardev/char-pty.c | 4 +++- chardev/char-socket.c | 17 ++++++++--------- chardev/char.c | 8 ++------ hw/misc/ivshmem-pci.c | 4 ++-- include/chardev/char.h | 21 ++++++++++++++++++++- 5 files changed, 35 insertions(+), 19 deletions(-) diff --git a/chardev/char-pty.c b/chardev/char-pty.c index 047aade09e..f4294679be 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -336,6 +336,7 @@ static bool pty_chr_open(Chardev *chr, ChardevBackend *= backend, Error **errp) int master_fd, slave_fd; char *name; char *path =3D backend->u.pty.data->path; + g_autofree char *filename =3D NULL; =20 s =3D PTY_CHARDEV(chr); =20 @@ -351,7 +352,8 @@ static bool pty_chr_open(Chardev *chr, ChardevBackend *= backend, Error **errp) return false; } =20 - chr->filename =3D g_strdup_printf("pty:%s", s->pty_name); + filename =3D g_strdup_printf("pty:%s", s->pty_name); + qemu_chr_set_filename(chr, filename); qemu_printf("char device redirected to %s (label %s)\n", s->pty_name, chr->label); =20 diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 31c9acd164..9387760009 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -384,8 +384,7 @@ static void tcp_chr_free_connection(Chardev *chr) s->sioc =3D NULL; object_unref(OBJECT(s->ioc)); s->ioc =3D NULL; - g_free(chr->filename); - chr->filename =3D NULL; + qemu_chr_set_filename(chr, NULL); tcp_chr_change_state(s, TCP_CHARDEV_STATE_DISCONNECTED); } =20 @@ -443,11 +442,11 @@ static void update_disconnected_filename(SocketCharde= v *s) { Chardev *chr =3D CHARDEV(s); =20 - g_free(chr->filename); if (s->addr) { - chr->filename =3D qemu_chr_socket_address(s, "disconnected:"); + g_autofree char *filename =3D qemu_chr_socket_address(s, "disconne= cted:"); + qemu_chr_set_filename(chr, filename); } else { - chr->filename =3D g_strdup("disconnected:socket"); + qemu_chr_set_filename(chr, "disconnected:socket"); } } =20 @@ -638,9 +637,9 @@ static void tcp_chr_connect(void *opaque) { Chardev *chr =3D CHARDEV(opaque); SocketChardev *s =3D SOCKET_CHARDEV(opaque); + g_autofree char *filename =3D qemu_chr_compute_filename(s); =20 - g_free(chr->filename); - chr->filename =3D qemu_chr_compute_filename(s); + qemu_chr_set_filename(chr, filename); =20 tcp_chr_change_state(s, TCP_CHARDEV_STATE_CONNECTED); update_ioc_handlers(s); @@ -1000,8 +999,8 @@ static void tcp_chr_accept_server_sync(Chardev *chr) { SocketChardev *s =3D SOCKET_CHARDEV(chr); QIOChannelSocket *sioc; - info_report("QEMU waiting for connection on: %s", - chr->filename); + g_autofree char *filename =3D qemu_chr_get_filename(chr); + info_report("QEMU waiting for connection on: %s", filename); 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); diff --git a/chardev/char.c b/chardev/char.c index 0dc792b88f..bdd907f015 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -309,7 +309,7 @@ static void char_finalize(Object *obj) if (chr->fe) { chr->fe->chr =3D NULL; } - g_free(chr->filename); + qemu_chr_set_filename(chr, NULL); g_free(chr->label); if (chr->logfd !=3D -1) { close(chr->logfd); @@ -796,7 +796,7 @@ static int qmp_query_chardev_foreach(Object *obj, void = *data) ChardevInfo *value =3D g_malloc0(sizeof(*value)); =20 value->label =3D g_strdup(chr->label); - value->filename =3D g_strdup(chr->filename); + value->filename =3D qemu_chr_get_filename(chr); value->frontend_open =3D chr->fe && chr->fe->fe_is_open; =20 QAPI_LIST_PREPEND(*list, value); @@ -1025,10 +1025,6 @@ static Chardev *chardev_new(const char *id, const ch= ar *typename, return NULL; } =20 - if (!chr->filename) { - chr->filename =3D g_strdup(typename + 8); - } - return chr; } =20 diff --git a/hw/misc/ivshmem-pci.c b/hw/misc/ivshmem-pci.c index 636d0b83de..2c7b987241 100644 --- a/hw/misc/ivshmem-pci.c +++ b/hw/misc/ivshmem-pci.c @@ -873,10 +873,10 @@ static void ivshmem_common_realize(PCIDevice *dev, Er= ror **errp) host_memory_backend_set_mapped(s->hostmem, true); } else { Chardev *chr =3D qemu_chr_fe_get_driver(&s->server_chr); + char *filename =3D qemu_chr_get_filename(chr); assert(chr); =20 - IVSHMEM_DPRINTF("using shared memory server (socket =3D %s)\n", - chr->filename); + IVSHMEM_DPRINTF("using shared memory server (socket =3D %s)\n", fi= lename); =20 /* we allocate enough space for 16 peers and grow as needed */ resize_peers(s, 16); diff --git a/include/chardev/char.h b/include/chardev/char.h index d36e50b99e..ffeb4a4e3b 100644 --- a/include/chardev/char.h +++ b/include/chardev/char.h @@ -62,7 +62,7 @@ struct Chardev { QemuMutex chr_write_lock; CharFrontend *fe; char *label; - char *filename; + char *_filename; int logfd; int be_open; /* used to coordinate the chardev-change special-case: */ @@ -72,6 +72,25 @@ struct Chardev { DECLARE_BITMAP(features, QEMU_CHAR_FEATURE_LAST); }; =20 +static inline char *qemu_chr_get_filename(Chardev *chr) +{ + const char *typename; + + if (chr->_filename) { + return g_strdup(chr->_filename); + } + + typename =3D object_get_typename(OBJECT(chr)); + assert(g_str_has_prefix(typename, "chardev-")); + return g_strdup(typename + 8); +} + +static inline void qemu_chr_set_filename(Chardev *chr, const char *filenam= e) +{ + g_free(chr->_filename); + chr->_filename =3D g_strdup(filename); +} + /** * qemu_chr_new_from_opts: * @opts: see qemu-config.c for a list of valid options --=20 2.48.1