From nobody Sat Nov 23 22:50:34 2024 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1728913423; cv=none; d=zohomail.com; s=zohoarc; b=gD2i8p8p6e70EdKPDBotOlP4HeOP2n5FgFceKASIecepQnO3ZFR7YAnLSRSBn+uIh6GRzW144OgEP/w7aG8iso3YuQCuWsZSRdl12jSXFNEoBlw9Te0BdJMlFNGeEUMlErl7zHB8lk/I/jbciJcSC4pcYFHWWA1PrG28jlanN48= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1728913423; 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=4UkssCHtZn6euZrutNV08M+zkXLuzb949FB1rSug110=; b=mj9veXvJ/NuywEiIYgB6QJb+LzWO3MRjIWBFKxTLlCE/fYaVjVKE+9Hzs9zx0twQE3A/WWHKzXU30AfF2IqRBg5nDH8V4aeCJtoQ4wNr+bLyiSiPPJle/XBerlIcFoeiIIBsr6kyrV1TeHPIfVVvSqiff+6d+WjV3Mw8QSJwqtM= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 172891342379654.59895579920669; Mon, 14 Oct 2024 06:43:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t0LJM-0000vg-Gu; Mon, 14 Oct 2024 09:40:36 -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 1t0LJC-0000sS-Dl for qemu-devel@nongnu.org; Mon, 14 Oct 2024 09:40:27 -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 1t0LJ9-0003vQ-Ko for qemu-devel@nongnu.org; Mon, 14 Oct 2024 09:40:25 -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-673-bzmvVnVlMm2e96Yffiwk6A-1; Mon, 14 Oct 2024 09:40:15 -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 580421955F3E; Mon, 14 Oct 2024 13:40:14 +0000 (UTC) Received: from localhost (unknown [10.39.208.12]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 289E03000198; Mon, 14 Oct 2024 13:40:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728913218; 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=4UkssCHtZn6euZrutNV08M+zkXLuzb949FB1rSug110=; b=GAYoIPZxvCqrxgVBfYhJFEQUZrCiK/ecPoBVLUKS8zJnHV+ZdvRwH1yxa5ZykNAWoKoVbq U2yCGEcv3K84SW3Yszbt5+xeV3Y1DrfeG/e3Qk+XE+TWhiWWOk1Pr5fq9LExaOL4byoKws KS4VPF9UIpd3UUraeCMm1eACpCPSX7c= X-MC-Unique: bzmvVnVlMm2e96Yffiwk6A-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 07/20] ui/dbus: discard pending CursorDefine on new one Date: Mon, 14 Oct 2024 17:39:22 +0400 Message-ID: <20241014133935.470709-8-marcandre.lureau@redhat.com> In-Reply-To: <20241014133935.470709-1-marcandre.lureau@redhat.com> References: <20241014133935.470709-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: 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.076, 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_SBL_CSS=3.335, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=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: 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: 1728913425450116600 From: Marc-Andr=C3=A9 Lureau Similar to scanout updates, let's discard pending cursor changes. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Akihiko Odaki Message-ID: <20241008125028.1177932-8-marcandre.lureau@redhat.com> --- ui/dbus-listener.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c index 19cb74e92b..eca6890ce6 100644 --- a/ui/dbus-listener.c +++ b/ui/dbus-listener.c @@ -87,6 +87,7 @@ struct _DBusDisplayListener { =20 guint dbus_filter; guint32 display_serial_to_discard; + guint32 cursor_serial_to_discard; }; =20 G_DEFINE_TYPE(DBusDisplayListener, dbus_display_listener, G_TYPE_OBJECT) @@ -102,6 +103,14 @@ static void ddl_discard_display_messages(DBusDisplayLi= stener *ddl) g_atomic_int_set(&ddl->display_serial_to_discard, serial); } =20 +static void ddl_discard_cursor_messages(DBusDisplayListener *ddl) +{ + guint32 serial =3D g_dbus_connection_get_last_serial( + g_dbus_proxy_get_connection(G_DBUS_PROXY(ddl->proxy))); + + g_atomic_int_set(&ddl->cursor_serial_to_discard, serial); +} + #ifdef CONFIG_OPENGL static void dbus_scanout_disable(DisplayChangeListener *dcl) { @@ -502,6 +511,8 @@ static void dbus_cursor_dmabuf(DisplayChangeListener *d= cl, return; } =20 + ddl_discard_cursor_messages(ddl); + egl_dmabuf_import_texture(dmabuf); texture =3D qemu_dmabuf_get_texture(dmabuf); if (!texture) { @@ -745,6 +756,8 @@ static void dbus_cursor_define(DisplayChangeListener *d= cl, DBusDisplayListener *ddl =3D container_of(dcl, DBusDisplayListener, dc= l); GVariant *v_data =3D NULL; =20 + ddl_discard_cursor_messages(ddl); + v_data =3D g_variant_new_from_data( G_VARIANT_TYPE("ay"), c->data, @@ -1028,6 +1041,21 @@ dbus_filter(GDBusConnection *connection, } } =20 + discard_serial =3D g_atomic_int_get(&ddl->cursor_serial_to_discard); + if (serial <=3D discard_serial) { + const gchar *member =3D g_dbus_message_get_member(message); + static const char *const cursor_messages[] =3D { + "CursorDefine", + NULL + }; + + if (g_strv_contains(cursor_messages, member)) { + trace_dbus_filter(serial, discard_serial); + g_object_unref(message); + return NULL; + } + } + return message; } =20 --=20 2.47.0