{"id":2230553,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2230553/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260430-qemu-vnc-v3-17-be96757428d0@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260430-qemu-vnc-v3-17-be96757428d0@redhat.com>","date":"2026-04-29T21:02:50","name":"[v3,17/26] ui/vnc: clean up VNC displays on exit","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"45f122c49208a824397ba6f3855371ce19a920f5","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/1.1/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260430-qemu-vnc-v3-17-be96757428d0@redhat.com/mbox/","series":[{"id":502150,"url":"http://patchwork.ozlabs.org/api/1.1/series/502150/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502150","date":"2026-04-29T21:02:34","name":"ui: add standalone VNC server over D-Bus","version":3,"mbox":"http://patchwork.ozlabs.org/series/502150/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2230553/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2230553/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=PvloAO1U;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g5VGj26q0z1yHv\n\tfor ; Thu, 30 Apr 2026 07:06:37 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wIC6r-0007uo-3c; Wed, 29 Apr 2026 17:06:20 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wIC5e-0006OV-UU\n for qemu-devel@nongnu.org; Wed, 29 Apr 2026 17:05:11 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wIC5c-0003V5-O5\n for qemu-devel@nongnu.org; Wed, 29 Apr 2026 17:05:02 -0400","from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-463-o7l964QgOf2P83nbbpg2UQ-1; Wed,\n 29 Apr 2026 17:04:54 -0400","from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 5EF6A19560B7\n for ; Wed, 29 Apr 2026 21:04:53 +0000 (UTC)","from localhost (unknown [10.44.22.2])\n by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id 007661800577; Wed, 29 Apr 2026 21:04:51 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1777496695;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=K9ejhMqDOIAnqlDB6S6XDF5JcjPS+M/QLKhH2rZsC/U=;\n b=PvloAO1UvWpqe4CgtZYMrajkFzhXTGM/ztrKuSEiCSQKkeCUSV6KgoAG556hWTu869VkLB\n LLrZcx4GFNUMRuum5tnu9qtBIFpKUnH4COxKMjRjA9DRrokvSldyJaorQMcyVxyJbHtOgZ\n IWTZef6jWt8v4dUPulHOmncK9pXeTfM=","X-MC-Unique":"o7l964QgOf2P83nbbpg2UQ-1","X-Mimecast-MFC-AGG-ID":"o7l964QgOf2P83nbbpg2UQ_1777496693","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","Date":"Thu, 30 Apr 2026 01:02:50 +0400","Subject":"[PATCH v3 17/26] ui/vnc: clean up VNC displays on exit","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"8bit","Message-Id":"<20260430-qemu-vnc-v3-17-be96757428d0@redhat.com>","References":"<20260430-qemu-vnc-v3-0-be96757428d0@redhat.com>","In-Reply-To":"<20260430-qemu-vnc-v3-0-be96757428d0@redhat.com>","To":"qemu-devel@nongnu.org","Cc":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","X-Developer-Signature":"v=1; a=openpgp-sha256; l=3164;\n i=marcandre.lureau@redhat.com; h=from:subject:message-id;\n bh=UofqdxEpsoMU3tHdoWYdaOMGh4untiTWKq2jjDIVs/Q=;\n b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBp8nIMJ1jHyit5LpouPussdgMCirQheJLzzaMuf\n CCUYpcUpy6JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCafJyDAAKCRDa6OEJdZac\n 5dltD/4mDqHs1l5qBtnLmqVCgXkW8sFKReO1HjMEcepO2AP+mwOcaNB7VV3gRaNLZMM5mgTs8o1\n jEUrJkyFH4nXB4pIUlSX3UwF4NHLmcN8ZXPQMnzXugxl25XFGc41s/IoSn/bAGOEYjxMTChUIpb\n 5j0uvttmP/N8i4jbhIwGvokhYWbnYPm5DsQazcCvGAKoOHw8kYgvjXKBg20SscqVoO/8Xn7R9Ly\n JJk25QHu7ueag2JgFdUwREfZN8ffrVp9BcsHJ+StD9aBy8XFbz8eAm73WPjinCWzKoN7qilHJV+\n DxsmyFRcdaS7Z83b9CbldlkNZliZN08PBVFNZfMnuHSlyFrAGjlrPHYp1x5Cu1yKMn4k+VKx5L4\n YhuMNdFB5svr7FSGoQYt/+XwJl8MSFRCrnJqQtCycqhpeGvbbzxFpaGro5kEaOf8BxgQ4ja1Uzw\n cnU6/TFLUOOtrsGEml6E2Y43oy7D2P+p+W9GC7BQgLNbfdplFe4UmzK9ny+TQfHYnjQD/Wd8/l0\n KxsyZ9z2CV4f/IU7budzMZBcygkqujol7YrzVKKSzilMCuCqOZGHhNF/lLcSdcgIIcry9hQFC76\n JUwo6i9TiVpVIHEVB4W3JjyibDoa85keKa4ZHa8ZXMcbAz3CxKhQZzGnbT0TPE8YI4lOJbXEHGW\n iENqQFGK0M30qxQ==","X-Developer-Key":"i=marcandre.lureau@redhat.com; a=openpgp;\n fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.93","Received-SPF":"pass client-ip=170.10.129.124;\n envelope-from=marcandre.lureau@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"12","X-Spam_score":"1.2","X-Spam_bar":"+","X-Spam_report":"(1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001,\n SPF_PASS=-0.001 autolearn=no 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Previously, VNC displays were never torn down on QEMU exit, leaking\nresources and leaving connected clients with unclean disconnects.\n\nAdd vnc_cleanup() to free all VNC displays during qemu_cleanup().\nMake vnc_display_close() initiate disconnection of active clients,\nand have vnc_display_free() drain the main loop until all clients\nhave completed their teardown, instead of asserting the client list\nis empty.\n\nSigned-off-by: Marc-André Lureau \n---\n include/ui/console.h | 1 +\n system/runstate.c | 5 +++++\n ui/vnc.c | 20 ++++++++++++++++++--\n 3 files changed, 24 insertions(+), 2 deletions(-)","diff":"diff --git a/include/ui/console.h b/include/ui/console.h\nindex 550a5e08e46..89fb4c1942a 100644\n--- a/include/ui/console.h\n+++ b/include/ui/console.h\n@@ -445,6 +445,7 @@ void vnc_parse(const char *str);\n int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp);\n bool vnc_display_reload_certs(const char *id, Error **errp);\n bool vnc_display_update(DisplayUpdateOptionsVNC *arg, Error **errp);\n+void vnc_cleanup(void);\n \n /* input.c */\n int index_from_key(const char *key, size_t key_length);\ndiff --git a/system/runstate.c b/system/runstate.c\nindex 770253b467b..0e1cb3b4e67 100644\n--- a/system/runstate.c\n+++ b/system/runstate.c\n@@ -61,6 +61,8 @@\n #include \"system/confidential-guest-support.h\"\n #include \"system/system.h\"\n #include \"system/tpm.h\"\n+#include \"ui/console.h\"\n+\n #include \"trace.h\"\n \n static NotifierList exit_notifiers =\n@@ -1044,5 +1046,8 @@ void qemu_cleanup(int status)\n monitor_cleanup();\n qemu_chr_cleanup();\n user_creatable_cleanup();\n+#ifdef CONFIG_VNC\n+ vnc_cleanup();\n+#endif\n /* TODO: unref root container, check all devices are ok */\n }\ndiff --git a/ui/vnc.c b/ui/vnc.c\nindex 1c649e7bccf..d65153a5001 100644\n--- a/ui/vnc.c\n+++ b/ui/vnc.c\n@@ -3473,8 +3473,13 @@ VncDisplay *vnc_display_new(const char *id, Error **errp)\n \n static void vnc_display_close(VncDisplay *vd)\n {\n+ VncState *vs;\n+\n assert(vd);\n \n+ QTAILQ_FOREACH(vs, &vd->clients, next) {\n+ vnc_disconnect_start(vs);\n+ }\n if (vd->listener) {\n qio_net_listener_disconnect(vd->listener);\n object_unref(OBJECT(vd->listener));\n@@ -3515,10 +3520,12 @@ void vnc_display_free(VncDisplay *vd)\n return;\n }\n \n- assert(QTAILQ_EMPTY(&vd->clients));\n+ vnc_display_close(vd);\n+ while (!QTAILQ_EMPTY(&vd->clients)) {\n+ main_loop_wait(false);\n+ }\n \n vnc_stop_worker_thread(vd);\n- vnc_display_close(vd);\n unregister_displaychangelistener(&vd->dcl);\n qkbd_state_free(vd->kbd);\n qemu_del_vm_change_state_handler(vd->vmstate_handler_entry);\n@@ -4348,6 +4355,15 @@ int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp)\n return vnc_display_new(id, errp) != NULL ? 0 : -1;\n }\n \n+void vnc_cleanup(void)\n+{\n+ VncDisplay *vd, *vd_next;\n+\n+ QTAILQ_FOREACH_SAFE(vd, &vnc_displays, next, vd_next) {\n+ vnc_display_free(vd);\n+ }\n+}\n+\n static void vnc_register_config(void)\n {\n qemu_add_opts(&qemu_vnc_opts);\n","prefixes":["v3","17/26"]}