From nobody Tue Apr 7 04:22:01 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=1773737494; cv=none; d=zohomail.com; s=zohoarc; b=HlWO3ILN9ziiAwAzD/K+T09REuw92ITWlXENCOdU3KFDUyHJVrt9cDLp6UQYW7SS56L7mJLXBfQlU6ziiiOFc+t+IMxRDVMCQzElzvKNYJYKgUcjsW6sVdSuVbiDldyhkjRt6P3JLKLJFW9ihrYYJAXChBAevJzoctvq26G1pBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773737494; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=lCfogonzVWuqUsCZibtn9CrGck935VlJnTOvoIoLaI4=; b=A+dK37mfI+cEX0Zi6tK7Vi8OLuMCwxPFLGxSVQl+5Ept3wTDoU8Pm+eAUN6I841DVk9FDNaQXVW/fy62lDp6xBWAiga8cwS8xT3aEeTxd3KcV5Yk+OUyaYCpPqJr78KAORsgkxvofbB65as+YYiUvp3uH4gWTLAm6X4UGeKfzas= 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 1773737494167476.8004577273423; Tue, 17 Mar 2026 01:51:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2Q8v-0005cS-Rd; Tue, 17 Mar 2026 04:51:13 -0400 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 1w2Q8g-0005WP-Pc for qemu-devel@nongnu.org; Tue, 17 Mar 2026 04:51:01 -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 1w2Q8f-0002ec-6x for qemu-devel@nongnu.org; Tue, 17 Mar 2026 04:50:58 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-185-aZgkQtFAOyWwTKRetsuWqw-1; Tue, 17 Mar 2026 04:50:54 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C55EF19560B4 for ; Tue, 17 Mar 2026 08:50:53 +0000 (UTC) Received: from localhost (unknown [10.44.22.6]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8CCA63000223 for ; Tue, 17 Mar 2026 08:50:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773737456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lCfogonzVWuqUsCZibtn9CrGck935VlJnTOvoIoLaI4=; b=Gy2KfrI1MUoU/8yMicdbXBvnQD7hKBsNJ3GGZedgqbhEpeFQrmH4Z6BUQExh7XAp0/ABUZ YoWfnY79i9h3+H4PYp3SVjiszuvG+19Fa5TKB3LIQIJIa+OG8EpgqrGw30CXlbtlsM8qOx DNWdrTkIpCuCwMyZ1i3GN9bUpGyFxPk= X-MC-Unique: aZgkQtFAOyWwTKRetsuWqw-1 X-Mimecast-MFC-AGG-ID: aZgkQtFAOyWwTKRetsuWqw_1773737453 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Tue, 17 Mar 2026 12:50:16 +0400 Subject: [PATCH 02/60] ui/vnc-jobs: clear source tag MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260317-qemu-vnc-v1-2-48eb1dcf7b76@redhat.com> References: <20260317-qemu-vnc-v1-0-48eb1dcf7b76@redhat.com> In-Reply-To: <20260317-qemu-vnc-v1-0-48eb1dcf7b76@redhat.com> To: qemu-devel@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=3974; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=z9xlIu2VqM0UcsaG7dgBxxV0J2Tcq9TvqcBIeQ44UFo=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBpuRXZAN5pfJZfFFS5gMN9Nym9pzLS5zVhnklRL 3qCQ0NyA4iJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCabkV2QAKCRDa6OEJdZac 5Q3ID/99oAAR2K8vkDXe05VGhj1D6Lfz4UzWmjKZT3QDTEny6b9WRn+e+w6eQhYIxK3Q9iAO3oN 188IoHdt9QhEIe7klMy/YhjJLfwJq6g10QSlj2YBS8GfAt7ZrbBzBabbdPCeHssC+ZVjZxR08H7 UD+YSiZRmgIQKsRdeuj0KmvYa/GHFGCi7sUSLevCzq5oOLwPbFpLCTVnUpUyATUoVpG0fnMDi5l o4yUq2UMLe1tDZXSehiAoP3qiht7NY+jEEWdzR3SBiLlgNmKn6JbwrqwcYBUjKAV3yKlLWlfpNO c1FN15rWGVmDasAeU9k2TFpVv4CkPLP6ErnL6SQE5DsMxcO5a8cG3IOid41VJY1Nb+b2W149wzv W7lvECDg7uHy5bcXJsq0gEf/RlqaNkBCHDwrHwKS0FBXYgUsv8GVQqXcOD9IMhr1Z5dXMCiDY46 OruWFgF2klzKfW0aVGL081/zkt2M3qC+3vFIEIPdZXbAGoijFAFvRVqrHIozAsMx79YA0kb8Qtr NN511fKwL9SH+GznIud+hgA5J1drMCE04jLI/Hy7ydRqZoW9owCqRJ5uDAo4/x8gNkvus+2XyMW jq5n5Sx6ko/RMrmWRZZHA3KI6Qa0/DtN5bvxar6iSsCrdlc4mLmgKPfYX2i2jyUWDUWbEI5inYV E40Dz4IFuZ0WpnA== 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=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: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, 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: , 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: 1773737495581158500 Avoid potentially removing a dangling source & simplify code. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 --- ui/vnc-jobs.c | 4 +--- ui/vnc.c | 31 +++++++------------------------ 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c index ca625da6d05..ec90ae6d5fc 100644 --- a/ui/vnc-jobs.c +++ b/ui/vnc-jobs.c @@ -162,9 +162,7 @@ void vnc_jobs_consume_buffer(VncState *vs) vnc_lock_output(vs); if (vs->jobs_buffer.offset) { if (vs->ioc !=3D NULL && buffer_empty(&vs->output)) { - if (vs->ioc_tag) { - g_source_remove(vs->ioc_tag); - } + g_clear_handle_id(&vs->ioc_tag, g_source_remove); if (vs->disconnecting =3D=3D FALSE) { vs->ioc_tag =3D qio_channel_add_watch( vs->ioc, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_OUT, diff --git a/ui/vnc.c b/ui/vnc.c index 952976e9649..ccc73bd7aa4 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1301,10 +1301,7 @@ static void vnc_disconnect_start(VncState *vs) } trace_vnc_client_disconnect_start(vs, vs->ioc); vnc_set_share_mode(vs, VNC_SHARE_MODE_DISCONNECTED); - if (vs->ioc_tag) { - g_source_remove(vs->ioc_tag); - vs->ioc_tag =3D 0; - } + g_clear_handle_id(&vs->ioc_tag, g_source_remove); qio_channel_close(vs->ioc, NULL); vs->disconnecting =3D TRUE; } @@ -1462,9 +1459,7 @@ static size_t vnc_client_write_plain(VncState *vs) } =20 if (vs->output.offset =3D=3D 0) { - if (vs->ioc_tag) { - g_source_remove(vs->ioc_tag); - } + g_clear_handle_id(&vs->ioc_tag, g_source_remove); vs->ioc_tag =3D qio_channel_add_watch( vs->ioc, G_IO_IN | G_IO_HUP | G_IO_ERR, vnc_client_io, vs, NULL); @@ -1500,9 +1495,7 @@ static void vnc_client_write(VncState *vs) if (vs->output.offset) { vnc_client_write_locked(vs); } else if (vs->ioc !=3D NULL) { - if (vs->ioc_tag) { - g_source_remove(vs->ioc_tag); - } + g_clear_handle_id(&vs->ioc_tag, g_source_remove); vs->ioc_tag =3D qio_channel_add_watch( vs->ioc, G_IO_IN | G_IO_HUP | G_IO_ERR, vnc_client_io, vs, NULL); @@ -1638,10 +1631,7 @@ gboolean vnc_client_io(QIOChannel *ioc G_GNUC_UNUSED, } =20 if (vs->disconnecting) { - if (vs->ioc_tag !=3D 0) { - g_source_remove(vs->ioc_tag); - } - vs->ioc_tag =3D 0; + g_clear_handle_id(&vs->ioc_tag, g_source_remove); } return TRUE; } @@ -1684,9 +1674,7 @@ void vnc_write(VncState *vs, const void *data, size_t= len) buffer_reserve(&vs->output, len); =20 if (vs->ioc !=3D NULL && buffer_empty(&vs->output)) { - if (vs->ioc_tag) { - g_source_remove(vs->ioc_tag); - } + g_clear_handle_id(&vs->ioc_tag, g_source_remove); vs->ioc_tag =3D qio_channel_add_watch( vs->ioc, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_OUT, vnc_client_io, vs, NULL); @@ -1734,10 +1722,7 @@ void vnc_flush(VncState *vs) vnc_client_write_locked(vs); } if (vs->disconnecting) { - if (vs->ioc_tag !=3D 0) { - g_source_remove(vs->ioc_tag); - } - vs->ioc_tag =3D 0; + g_clear_handle_id(&vs->ioc_tag, g_source_remove); } vnc_unlock_output(vs); } @@ -3342,9 +3327,7 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSoc= ket *sioc, VNC_DEBUG("New client on socket %p\n", vs->sioc); update_displaychangelistener(&vd->dcl, VNC_REFRESH_INTERVAL_BASE); qio_channel_set_blocking(vs->ioc, false, &error_abort); - if (vs->ioc_tag) { - g_source_remove(vs->ioc_tag); - } + g_clear_handle_id(&vs->ioc_tag, g_source_remove); if (websocket) { vs->websocket =3D 1; if (vd->tlscreds) { --=20 2.53.0