From nobody Sun Apr 12 06:04:43 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1770813137; cv=none; d=zohomail.com; s=zohoarc; b=iA6FMosa0r/743E4H5MKtcqPnD4hZmFEmBqaej7/hQPCh/wbmQSyVxcw5tDSfBF6Iqb0AICLKj1nY4tuDB92EVuVJ9uql+8+z5XYr5xLig+a2diAh1q685dksZ8wV2mLvKv7iBXnHjjpCeNfyf7IQKRaxmKnbmFfLMjWcoIVJjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770813137; 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=NawPSV0+R7Z6iBTNYDG41PH3COFdnG/VW+iZ15ECL/g=; b=fvy0f2vxvhBZRC3/dsvPhCz4XOFmqEszINpuz7aBChiwS20XJBgt4rRzNzeh15yjwrVwYGz8r73ikSnNztsUARqg18J8Q1EVIFn7PmpNH0ICWYPlQapkrKRbtTk0SUhHmQTFGfbeE53inS8wc0/xntlPoidIp3UXo6OeQkPkItk= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770813136994592.6697568368768; Wed, 11 Feb 2026 04:32:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vq9NZ-0000wv-RQ; Wed, 11 Feb 2026 07:31:38 -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 1vq9NJ-0000au-PU for qemu-devel@nongnu.org; Wed, 11 Feb 2026 07:31:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vq9NH-0000G0-Lq for qemu-devel@nongnu.org; Wed, 11 Feb 2026 07:31:21 -0500 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-27-vuGe2ZcvOIGOm3x7YZ09mA-1; Wed, 11 Feb 2026 07:31:15 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CCC011800454; Wed, 11 Feb 2026 12:31:13 +0000 (UTC) Received: from localhost (unknown [10.45.242.6]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 738A330001A8; Wed, 11 Feb 2026 12:31:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770813079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NawPSV0+R7Z6iBTNYDG41PH3COFdnG/VW+iZ15ECL/g=; b=JPQqM7x1SHgUi88i87dCfJNmVWVCJgTz44mhIZCHfvF4HisQDwIUBB0FtwFkJRV5CtOcNu LlM2qeBgigxbFU+GedQ9rT0r4CWxID1PxJH97MsxDsQnAi8JEYWq1NR87xPKwGrKZ1v33+ lE39QDgU2REkLWvT5yEZvLxNeDMOk1A= X-MC-Unique: vuGe2ZcvOIGOm3x7YZ09mA-1 X-Mimecast-MFC-AGG-ID: vuGe2ZcvOIGOm3x7YZ09mA_1770813074 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Eduardo Habkost , xen-devel@lists.xenproject.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Edgar E. Iglesias" , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Eric Blake , Samuel Thibault , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Stabellini , Paul Durrant , Vladimir Sementsov-Ogievskiy Subject: [PULL 10/14] chardev: rework filename handling Date: Wed, 11 Feb 2026 16:29:57 +0400 Message-ID: <20260211123007.3569932-11-marcandre.lureau@redhat.com> In-Reply-To: <20260211123007.3569932-1-marcandre.lureau@redhat.com> References: <20260211123007.3569932-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: 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 @redhat.com) X-ZM-MESSAGEID: 1770813139350154100 From: Vladimir Sementsov-Ogievskiy Instead of checking, did backend set the filename state or not, let's be stateless: filename is needed rarely, so, let's just have a generic function (with optional implementation by backends) to get it. Signed-off-by: Vladimir Sementsov-Ogievskiy [ Marc-Andr=C3=A9 - fix leak in ivshmem-pci.c ] Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20260115144606.233252-10-vsementsov@yandex-team.ru> --- include/chardev/char.h | 5 ++++- chardev/char-pty.c | 8 +++++++- chardev/char-socket.c | 31 ++++++++++++------------------- chardev/char.c | 21 +++++++++++++++------ hw/misc/ivshmem-pci.c | 7 ++++--- 5 files changed, 42 insertions(+), 30 deletions(-) diff --git a/include/chardev/char.h b/include/chardev/char.h index ada5529fa6c..81bc0cbdf2a 100644 --- a/include/chardev/char.h +++ b/include/chardev/char.h @@ -62,7 +62,6 @@ struct Chardev { QemuMutex chr_write_lock; CharFrontend *fe; char *label; - char *filename; int logfd; int be_open; /* used to coordinate the chardev-change special-case: */ @@ -309,6 +308,9 @@ struct ChardevClass { =20 /* return PTY name if available */ char *(*chr_get_pty_name)(Chardev *s); + + /* get filename for reporting */ + char *(*chr_get_filename)(Chardev *s); }; =20 Chardev *qemu_chardev_new(const char *id, const char *typename, @@ -324,5 +326,6 @@ void suspend_mux_open(void); void resume_mux_open(void); =20 char *qemu_chr_get_pty_name(Chardev *chr); +char *qemu_chr_get_filename(Chardev *chr); =20 #endif diff --git a/chardev/char-pty.c b/chardev/char-pty.c index 047aade09e5..7e95132cdbb 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -351,7 +351,6 @@ 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); qemu_printf("char device redirected to %s (label %s)\n", s->pty_name, chr->label); =20 @@ -393,6 +392,12 @@ static char *pty_chr_get_pty_name(Chardev *chr) return g_strdup(s->pty_name); } =20 +static char *pty_chr_get_filename(Chardev *chr) +{ + PtyChardev *s =3D PTY_CHARDEV(chr); + return g_strdup_printf("pty:%s", s->pty_name); +} + static void char_pty_class_init(ObjectClass *oc, const void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); @@ -403,6 +408,7 @@ static void char_pty_class_init(ObjectClass *oc, const = void *data) 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; + cc->chr_get_filename =3D pty_chr_get_filename; } =20 static const TypeInfo char_pty_type_info =3D { diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 908bbdbc124..5adeb908659 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -40,6 +40,7 @@ =20 static gboolean socket_reconnect_timeout(gpointer opaque); static void tcp_chr_telnet_init(Chardev *chr); +static char *qemu_chr_compute_filename(SocketChardev *s); =20 static void tcp_chr_change_state(SocketChardev *s, TCPChardevState state) { @@ -384,8 +385,6 @@ 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; tcp_chr_change_state(s, TCP_CHARDEV_STATE_DISCONNECTED); } =20 @@ -439,16 +438,17 @@ static char *qemu_chr_socket_address(SocketChardev *s= , const char *prefix) } } =20 -static void update_disconnected_filename(SocketChardev *s) +static char *tcp_chr_get_filename(Chardev *chr) { - Chardev *chr =3D CHARDEV(s); + SocketChardev *s =3D SOCKET_CHARDEV(chr); =20 - g_free(chr->filename); - if (s->addr) { - chr->filename =3D qemu_chr_socket_address(s, "disconnected:"); - } else { - chr->filename =3D g_strdup("disconnected:socket"); + if (s->state =3D=3D TCP_CHARDEV_STATE_CONNECTED) { + return qemu_chr_compute_filename(s); + } else if (s->addr) { + return qemu_chr_socket_address(s, "disconnected:"); } + + return g_strdup("disconnected:socket"); } =20 /* NB may be called even if tcp_chr_connect has not been @@ -468,7 +468,6 @@ static void tcp_chr_disconnect_locked(Chardev *chr) qio_net_listener_set_client_func_full(s->listener, tcp_chr_accept, chr, NULL, chr->gcontext); } - update_disconnected_filename(s); if (emit_close) { qemu_chr_be_event(chr, CHR_EVENT_CLOSED); } @@ -639,9 +638,6 @@ static void tcp_chr_connect(void *opaque) Chardev *chr =3D CHARDEV(opaque); SocketChardev *s =3D SOCKET_CHARDEV(opaque); =20 - g_free(chr->filename); - chr->filename =3D qemu_chr_compute_filename(s); - tcp_chr_change_state(s, TCP_CHARDEV_STATE_CONNECTED); update_ioc_handlers(s); qemu_chr_be_event(chr, CHR_EVENT_OPENED); @@ -1000,8 +996,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); @@ -1258,8 +1254,6 @@ static int qmp_chardev_open_socket_server(Chardev *ch= r, s->addr =3D qio_net_listener_get_local_address(s->listener, 0, errp); =20 skip_listen: - update_disconnected_filename(s); - if (is_waitconnect) { tcp_chr_accept_server_sync(chr); } else { @@ -1436,8 +1430,6 @@ static bool tcp_chr_open(Chardev *chr, ChardevBackend= *backend, Error **errp) } s->registered_yank =3D true; =20 - update_disconnected_filename(s); - if (s->is_listen) { if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, is_waitconnect, errp) < 0) { @@ -1593,6 +1585,7 @@ static void char_socket_class_init(ObjectClass *oc, c= onst void *data) cc->chr_add_watch =3D tcp_chr_add_watch; cc->chr_update_read_handler =3D tcp_chr_update_read_handler; cc->chr_listener_cleanup =3D tcp_chr_listener_cleanup; + cc->chr_get_filename =3D tcp_chr_get_filename; =20 object_class_property_add(oc, "addr", "SocketAddress", char_socket_get_addr, NULL, diff --git a/chardev/char.c b/chardev/char.c index 0dc792b88f7..3373c9b61f8 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -309,7 +309,6 @@ static void char_finalize(Object *obj) if (chr->fe) { chr->fe->chr =3D NULL; } - g_free(chr->filename); g_free(chr->label); if (chr->logfd !=3D -1) { close(chr->logfd); @@ -796,7 +795,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 +1024,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 @@ -1110,6 +1105,20 @@ char *qemu_chr_get_pty_name(Chardev *chr) return NULL; } =20 +char *qemu_chr_get_filename(Chardev *chr) +{ + ChardevClass *cc =3D CHARDEV_GET_CLASS(chr); + const char *typename; + + if (cc->chr_get_filename) { + return cc->chr_get_filename(chr); + } + + typename =3D object_get_typename(OBJECT(chr)); + assert(g_str_has_prefix(typename, "chardev-")); + return g_strdup(typename + 8); +} + ChardevReturn *qmp_chardev_change(const char *id, ChardevBackend *backend, Error **errp) { diff --git a/hw/misc/ivshmem-pci.c b/hw/misc/ivshmem-pci.c index b9162589a02..a3a43f53bd1 100644 --- a/hw/misc/ivshmem-pci.c +++ b/hw/misc/ivshmem-pci.c @@ -873,10 +873,11 @@ 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); - assert(chr); + g_autofree char *filename =3D NULL; =20 - IVSHMEM_DPRINTF("using shared memory server (socket =3D %s)\n", - chr->filename); + assert(chr); + filename =3D qemu_chr_get_filename(chr); + 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); --=20 2.52.0