From nobody Wed Aug 26 06:36:29 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=1781168891; cv=none; d=zohomail.com; s=zohoarc; b=Q0UOLaxFBaQG7GwObsn51Z8l9rJ72EbM4pmER5pVjdXAFcHggi7HW80TUl8oQJ0OdN3Htn98hrIuf0oJUVzNHpynUtQeac0/rOLS6wlJA+E4c+RBQNgqdi91j4kvZOQtwSrJtt8wK7xXddxkBAaviroqyqhANog4uBNm80OMJcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781168891; 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=7WXhIg19XYA4431BKDjvjcmVSAPWCiVeU7ZNrGEjkog=; b=Wb/iHDznRHOAcYaNk/gXTQnV3yD8xgMqbHcrdKCJyyjoV/dSYtOjQtF9yG0zh8zarisMVCuF48wPCPDT0pqsfGRygHFPBBZ76bAt1+ZqbsBRG+RcrM9+kDHE0SUqqz87POJRUWm68u4jzv+btEX2d+7EzSHyIIbSQNR4xCPSmb4= 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 17811688918471005.7095788053912; Thu, 11 Jun 2026 02:08:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wXbLu-0003A2-4P; Thu, 11 Jun 2026 05:05:30 -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 1wXbLo-0002zH-Pb for qemu-devel@nongnu.org; Thu, 11 Jun 2026 05:05:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wXbLn-00052H-4q for qemu-devel@nongnu.org; Thu, 11 Jun 2026 05:05:24 -0400 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-114-RQoECx0KNWG5NrRiONUpOw-1; Thu, 11 Jun 2026 05:05:17 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (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 B164C180AD60; Thu, 11 Jun 2026 09:05:15 +0000 (UTC) Received: from localhost (unknown [10.44.24.21]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 61DA72ED4; Thu, 11 Jun 2026 09:05:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1781168722; 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=7WXhIg19XYA4431BKDjvjcmVSAPWCiVeU7ZNrGEjkog=; b=aFD1JaQxzR8jv3q0l+giof/btlldkVJm+BxX6TyamkyvrQ2An7ufFRzwUYlvjT8Aoq6sBu vpHic2vu0PYgqQrVswAq1pS3ZmNTDg6rq7Z3vBJSOkMarAZvOOyojWaoeula0tp3WCLHh4 Rz1CdRgfSv0naBf5mzM612l8o7UKoKA= X-MC-Unique: RQoECx0KNWG5NrRiONUpOw-1 X-Mimecast-MFC-AGG-ID: RQoECx0KNWG5NrRiONUpOw_1781168715 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Thu, 11 Jun 2026 13:03:33 +0400 Subject: [PATCH v3 18/35] ui/sdl2: implement display cleanup MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260611-b4-ui-v3-18-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=1871; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=SWP3H5Ca5KhdDjJmOi5TL9GzYnm/xCZHZJpowaDC8dc=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqKnnfTLI4HTPi5KG4BZAMG5qZTGeuRVscsqfzc OzL10av9TyJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaip53wAKCRDa6OEJdZac 5VLRD/4hN6ouA39CbUyewopq1AhY/MKBwwnNi6H5/2lGmA/LSLMTU/DqK02rVEt6ppvZXRvJO/+ YUyDLOTSBUDesZQgEaQvsPoBcPLvdnf5dUSaT4K3Lxy4WvROIGA3esLyj6zyTCDg4vL/IpV0x2h wgjMuWx5vzXIVKyq26YMtWYTh3cO1CHqkYzE5pJiTqsoWQCDyXtqAzV6ZdvNm68WEkFhgH9co5P jqNExMJgUKHEZvRamQDzkZTQDSiTh1WhpttP4f47dAsiw4kknagDnP75LVusvYTHo3iCJQEtngJ uukejRqj9//O5gXnQOuftGnD8+98NCyY95KG/n3nrEwS0f7lddd5x7D42Oxhhxf8DCYPqmt8GPK 018VsakdX3QH0mNMDLu6NyGGffs5Iq9xiDlhQh/7o+maWHjtqKWuSHhKo7CBgVZcN5nvLJcfVk1 FZvPTz3A2bnN/IevhLu3z7LX05/yGAX61fMsRSfna/JbGG/KuSenGmdGoMchnsiCeV7HvpqDE86 Ol9fN0J6cK80/uMfkyXU9iiwhUfOCrvhCtbPcMof01vsNu7pePPKt6KJoW5vffqeorVgSEIwZda ryuK45H0+afXx6K1/qH4YA+2j6sik2iVuBIYEND3nwrLO9mWPu9OMcl7npuz30qEJXxqpdBvBbM Ah1GsIMeY2iQAfg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 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.133.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_H5=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: 1781168892768158500 Replace the atexit() handler with a proper cleanup callback. Extend sdl_cleanup() to unregister display listeners, free keyboard state, destroy windows, and clean up all cursor resources. Signed-off-by: Marc-Andr=C3=A9 Lureau --- ui/sdl2.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/ui/sdl2.c b/ui/sdl2.c index 4fcdbd79d3c..6adcbdb5af9 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -788,9 +788,25 @@ static void sdl_mouse_define(DisplayChangeListener *dc= l, =20 static void sdl_cleanup(void) { - if (guest_sprite) { - SDL_FreeCursor(guest_sprite); + int i; + + if (!sdl2_console) { + return; } + + qemu_remove_mouse_mode_change_notifier(&mouse_mode_notifier); + + for (i =3D 0; i < sdl2_num_outputs; i++) { + qemu_console_unregister_listener(&sdl2_console[i].dcl); + qkbd_state_free(sdl2_console[i].kbd); + sdl2_window_destroy(&sdl2_console[i]); + } + g_clear_pointer(&sdl2_console, g_free); + sdl2_num_outputs =3D 0; + + g_clear_pointer(&guest_sprite, SDL_FreeCursor); + g_clear_pointer(&guest_sprite_surface, SDL_FreeSurface); + g_clear_pointer(&sdl_cursor_hidden, SDL_FreeCursor); SDL_QuitSubSystem(SDL_INIT_VIDEO); } =20 @@ -995,8 +1011,6 @@ static void sdl2_display_init(DisplayState *ds, Displa= yOptions *o) sdl_grab_start(&sdl2_console[0]); } =20 - atexit(sdl_cleanup); - /* SDL's event polling (in dpy_refresh) must happen on the main thread= . */ qemu_main =3D NULL; } @@ -1005,6 +1019,7 @@ static QemuDisplay qemu_display_sdl2 =3D { .type =3D DISPLAY_TYPE_SDL, .early_init =3D sdl2_display_early_init, .init =3D sdl2_display_init, + .cleanup =3D sdl_cleanup, }; =20 static void register_sdl1(void) --=20 2.54.0