From nobody Wed Aug 26 06:36:09 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=1781168821; cv=none; d=zohomail.com; s=zohoarc; b=KLBmAI1cHssBWxma0Ex1jxvwwaPetqmni1jSQo6gIaK6RIry/yW3CcL8XBQ4RdI15QQ5lQzbOuaDhRsgIUem4GF/hzjvYRji6sNeyZQyEO5mEQ1VRxou/uGUUiGpiJtGaAg9UGC5g3z1zipgMKv8T6ib/aPanNqCTZFolsPJk3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781168821; 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=mBrMf6sgce6eqalfbiLawauqWyu0Pfl9VQff8GIECLs=; b=aNqnaS3/WxmTUF1DndA9PpVIrVlOHUDbvQ3AsQVgRAtGIW2xOtrvTpfIP04JV8KKuH05zoYLvhax1w70tPrR0BoIIl+WqS09HfZMekqfDZrCKSNs540npNkZxYVNFQG1CDn/t25ca2j0yvEAjyqzdX3tvbFo7JH7YFSrFXC4sPI= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781168821634574.80747113003; Thu, 11 Jun 2026 02:07:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wXbLb-0002bj-QQ; Thu, 11 Jun 2026 05:05:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wXbLa-0002Vj-EL for qemu-devel@nongnu.org; Thu, 11 Jun 2026 05:05:10 -0400 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 1wXbLY-0004p0-O9 for qemu-devel@nongnu.org; Thu, 11 Jun 2026 05:05:10 -0400 Received: from mx-prod-mc-06.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-529-We_ee5WyO863Vwp-monISQ-1; Thu, 11 Jun 2026 05:05:06 -0400 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 66CAD1800591; Thu, 11 Jun 2026 09:05:05 +0000 (UTC) Received: from localhost (unknown [10.44.24.21]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 762253008B34; Thu, 11 Jun 2026 09:05:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1781168708; 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=mBrMf6sgce6eqalfbiLawauqWyu0Pfl9VQff8GIECLs=; b=KfP7k55DarGxijoMuXWOSQi34nzqSdVVCKbubdB1yU4TEPdJVH+dNnRNA/N/9gkuxDhqnP 9bZ1VgCyQCG4oIorcJe+BrmC2aRHkibWgf5WcYa1fXzEcwYIoGU5S9jm3cGDjcltSeG6rJ MXoJCfa5VGPEOLjXdatIlmDj/7nrGK4= X-MC-Unique: We_ee5WyO863Vwp-monISQ-1 X-Mimecast-MFC-AGG-ID: We_ee5WyO863Vwp-monISQ_1781168705 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Thu, 11 Jun 2026 13:03:31 +0400 Subject: [PATCH v3 16/35] ui: add display cleanup infrastructure MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260611-b4-ui-v3-16-72bcbbea0fae@redhat.com> References: <20260611-b4-ui-v3-0-72bcbbea0fae@redhat.com> In-Reply-To: <20260611-b4-ui-v3-0-72bcbbea0fae@redhat.com> To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Fabiano Rosas , Laurent Vivier , Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Peter Maydell , Akihiko Odaki , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Developer-Signature: v=1; a=openpgp-sha256; l=3294; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=lwX43CcKsWPglzBRxIi4xAYVtk1qkhgPHDupwvecx6A=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqKnnfUQzBhIHyAdF99G+/IXkXobrUr6LlEgHUw nJpoxSjv4GJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaip53wAKCRDa6OEJdZac 5WJOD/0YHO3hmtGgBJ2aUUwI3GDwq70yibHqNgShIgCz5sE7dPpxYktVGisWB6jjdKK6PONpktY 6Qrh74dlOrmsTHiUuhe5/xVvDttcDJwI3ha7n7Gc5MlIBpFKG7rAom/bxcsj+IBWCULqGxLPv7Q bZn6Pfdkn36m95jPLH1I+Xp+U9ui4nvuWCIEEovvKhZStQER6STvTLgjzuTU2x/iF3BI9uqlupY m2jHq2TxjMjhizhmVZsivuKW+pATNgm9DfMHJ+c8jiyBCJU1GCFN5FHiWjEUbaJ66Mm+IObCm3a aEHG/cdEIPEDINxeTWtYEO/U/5P39QFD+56d2LUDgLzc6VGhGW5gEgCubJXn7yzZba/5PeczJIW 1KyY+KHbzkGxKP2pTXFY2ybjD3AP5wC55uytc8aiUgef7sDXLtn70kPFeBUrtbcDze0GUDsSWXq 0EFndz5lmU6tB18ht8JMFwOcBoKB17lwmGXiPiiEZXTwvPX3yvYEPNDwORQjJox4vur6Iibi56I ToSIo5QIQOlHx2etsEP3kkw1cx6KvP8oqIMKGg92cIzzWF9pwQ0NNPQzhVl305sGOB1uzELkBhn +gwiGl1O0NtoH9G7GyfMHwcPGjAgx1SykY87kvnRfeJlcqUrvAG7uir4VNBNvIE9c/sjlLaeS8H ikZALUPOyTkyfbg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 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=lists1p.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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H3=0.001, RCVD_IN_MSPIKE_WL=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: 1781168822666158500 Add a cleanup callback to QemuDisplay and a qemu_display_cleanup() function that iterates all registered display types and calls their cleanup handler. Wire it into qemu_cleanup() in runstate.c, replacing the ad-hoc vnc_cleanup() call. This provides a structured alternative to atexit() handlers, giving deterministic teardown ordering and making resource leaks visible to sanitizers. The cleanup should happen before user_creatable_cleanup(), since some display have weak user-creatable references to cleanup before. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/ui/console.h | 2 ++ system/runstate.c | 8 +------- ui/console.c | 20 +++++++++++++++++++- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index a31c5a4995c..1c7f7e62c1a 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -430,6 +430,7 @@ struct QemuDisplay { DisplayType type; void (*early_init)(DisplayOptions *opts); void (*init)(DisplayState *ds, DisplayOptions *opts); + void (*cleanup)(void); const char *vc; }; =20 @@ -438,6 +439,7 @@ bool qemu_display_find_default(DisplayOptions *opts); void qemu_display_early_init(DisplayOptions *opts); void qemu_display_init(DisplayState *ds, DisplayOptions *opts); const char *qemu_display_get_vc(DisplayOptions *opts); +void qemu_display_cleanup(void); void qemu_display_help(void); =20 /* vnc.c */ diff --git a/system/runstate.c b/system/runstate.c index d35fa270bd6..18e585be47f 100644 --- a/system/runstate.c +++ b/system/runstate.c @@ -62,7 +62,6 @@ #include "system/system.h" #include "system/tpm.h" #include "ui/console.h" -#include "ui/qemu-spice-module.h" =20 #include "trace.h" =20 @@ -1046,12 +1045,7 @@ void qemu_cleanup(int status) audio_cleanup(); monitor_cleanup(); qemu_chr_cleanup(); + qemu_display_cleanup(); user_creatable_cleanup(); -#ifdef CONFIG_VNC - vnc_cleanup(); -#endif -#ifdef CONFIG_SPICE - qemu_spice.cleanup(); -#endif /* TODO: unref root container, check all devices are ok */ } diff --git a/ui/console.c b/ui/console.c index 58f29e82c85..1fe3e3a3a6c 100644 --- a/ui/console.c +++ b/ui/console.c @@ -42,6 +42,7 @@ #include "qemu/memfd.h" #include "ui/vt100.h" #include "vgafont.h" +#include "ui/qemu-spice.h" =20 #include "console-priv.h" =20 @@ -575,7 +576,7 @@ void qemu_console_set_display_gl_ctx(QemuConsole *con, = DisplayGLCtx *gl) { /* display has opengl support */ assert(con); - if (con->gl) { + if (gl && con->gl) { error_report("The console already has an OpenGL context."); exit(1); } @@ -1414,6 +1415,23 @@ void qemu_display_init(DisplayState *ds, DisplayOpti= ons *opts) dpys[opts->type]->init(ds, opts); } =20 +void qemu_display_cleanup(void) +{ + int i; + + for (i =3D 0; i < DISPLAY_TYPE__MAX; i++) { + if (dpys[i] && dpys[i]->cleanup) { + dpys[i]->cleanup(); + } + } +#ifdef CONFIG_VNC + vnc_cleanup(); +#endif +#ifdef CONFIG_SPICE + qemu_spice.cleanup(); +#endif +} + const char *qemu_display_get_vc(DisplayOptions *opts) { #ifdef CONFIG_PIXMAN --=20 2.54.0