From nobody Sun Nov 24 01:01:57 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=1728392002; cv=none; d=zohomail.com; s=zohoarc; b=ZBWiyDUy9ZrbScIl7vl2iDD8vXXhx9/7o466kZvtc2YjOtt1B+jScZH7afYcRMQHdNZ99/yqAB0nrr7U5JRdaJyR76/JmgG/j0nPSgGzboW8FhgCxIwJVL5K+BK7nYX+gj8LHG2U6mSNmKTiVAp4gP6yY28XnvBR7wYlcWY0Hsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1728392002; 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=+IgTnRfniwRi77bd6UMA2D9j3/l/jJFMYCUgCknteSI=; b=dmomw/ppPJe9ptpdnpLngaKOsrRQpXnTzApdmq6p4v7bckHwErZald+3/KiWHingljKNl1lvUKGMlQW8RWGUrWVqVwP6kgv5wu3H0liZOP+0Th6LtdnOixTI233a6AFKhyUxmEe9n2xhval2U33ukDNyxqbizAMeGjWU+RvOhcA= 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 1728392002445712.7376290673203; Tue, 8 Oct 2024 05:53:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sy9hM-0000NR-AU; Tue, 08 Oct 2024 08:52:20 -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 1sy9h3-0008KY-BM for qemu-devel@nongnu.org; Tue, 08 Oct 2024 08:52:02 -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 1sy9h1-0002Wz-M8 for qemu-devel@nongnu.org; Tue, 08 Oct 2024 08:52:01 -0400 Received: from mx-prod-mc-05.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-237-6k_DrQVoO92eVaPQWzwn4g-1; Tue, 08 Oct 2024 08:51:57 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C4E9A1944A8A; Tue, 8 Oct 2024 12:51:56 +0000 (UTC) Received: from localhost (unknown [10.39.208.19]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9FFCE19560A3; Tue, 8 Oct 2024 12:51:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728391919; 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=+IgTnRfniwRi77bd6UMA2D9j3/l/jJFMYCUgCknteSI=; b=CR5Zr95XnXdiMM+/1PKtmNP4rGtecLm46eTIiUOhDKjtIl9q2/FyGW87Pi7PONOHjKdDcY eNLMpFS0aacdji22WWBonrIWsd5MwIbqyKwpFhJoIJjlLzPV8FfNfDu9FQPlRK1ohUBRrR EM75kcRCfIF7tuuTcuHIbyQnjAtrZDM= X-MC-Unique: 6k_DrQVoO92eVaPQWzwn4g-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Peter Maydell , Akihiko Odaki , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S. Tsirkin" , belmouss@redhat.com, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Paolo Bonzini , Gerd Hoffmann , Laurent Vivier Subject: [PATCH v2 16/19] ui/dbus: implement Unix.Map Date: Tue, 8 Oct 2024 16:50:25 +0400 Message-ID: <20241008125028.1177932-17-marcandre.lureau@redhat.com> In-Reply-To: <20241008125028.1177932-1-marcandre.lureau@redhat.com> References: <20241008125028.1177932-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.0 on 10.30.177.17 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.151, 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.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=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: 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: 1728392003614116600 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- ui/dbus-listener.c | 78 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 5 deletions(-) diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c index 7142afcddb..ec47946282 100644 --- a/ui/dbus-listener.c +++ b/ui/dbus-listener.c @@ -83,6 +83,8 @@ struct _DBusDisplayListener { #ifdef CONFIG_OPENGL egl_fb fb; #endif +#else /* !WIN32 */ + QemuDBusDisplay1ListenerUnixMap *map_proxy; #endif =20 guint dbus_filter; @@ -441,6 +443,51 @@ dbus_scanout_share_d3d_texture( return true; } #endif /* CONFIG_OPENGL */ +#else /* !WIN32 */ +static bool dbus_scanout_map(DBusDisplayListener *ddl) +{ + g_autoptr(GError) err =3D NULL; + g_autoptr(GUnixFDList) fd_list =3D NULL; + + if (ddl->ds_share =3D=3D SHARE_KIND_MAPPED) { + return true; + } + + if (!ddl->can_share_map || ddl->ds->shmfd =3D=3D -1) { + return false; + } + + ddl_discard_display_messages(ddl); + fd_list =3D g_unix_fd_list_new(); + if (g_unix_fd_list_append(fd_list, ddl->ds->shmfd, &err) !=3D 0) { + g_debug("Failed to setup scanout map fdlist: %s", err->message); + ddl->can_share_map =3D false; + return false; + } + + if (!qemu_dbus_display1_listener_unix_map_call_scanout_map_sync( + ddl->map_proxy, + g_variant_new_handle(0), + ddl->ds->shmfd_offset, + surface_width(ddl->ds), + surface_height(ddl->ds), + surface_stride(ddl->ds), + surface_format(ddl->ds), + G_DBUS_CALL_FLAGS_NONE, + DBUS_DEFAULT_TIMEOUT, + fd_list, + NULL, + NULL, + &err)) { + g_debug("Failed to call ScanoutMap: %s", err->message); + ddl->can_share_map =3D false; + return false; + } + + ddl->ds_share =3D SHARE_KIND_MAPPED; + + return true; +} #endif /* WIN32 */ =20 #ifdef CONFIG_OPENGL @@ -693,16 +740,22 @@ static void dbus_gfx_update(DisplayChangeListener *dc= l, =20 trace_dbus_update(x, y, w, h); =20 -#ifdef WIN32 if (dbus_scanout_map(ddl)) { +#ifdef WIN32 qemu_dbus_display1_listener_win32_map_call_update_map( ddl->map_proxy, x, y, w, h, G_DBUS_CALL_FLAGS_NONE, DBUS_DEFAULT_TIMEOUT, NULL, NULL, NULL); +#else + qemu_dbus_display1_listener_unix_map_call_update_map( + ddl->map_proxy, + x, y, w, h, + G_DBUS_CALL_FLAGS_NONE, + DBUS_DEFAULT_TIMEOUT, NULL, NULL, NULL); +#endif return; } -#endif =20 if (x =3D=3D 0 && y =3D=3D 0 && w =3D=3D surface_width(ddl->ds) && h = =3D=3D surface_height(ddl->ds)) { return ddl_scanout(ddl); @@ -879,7 +932,6 @@ dbus_display_listener_get_console(DBusDisplayListener *= ddl) return ddl->console; } =20 -#ifdef WIN32 static bool dbus_display_listener_implements(DBusDisplayListener *ddl, const char *ifa= ce) { @@ -894,6 +946,7 @@ dbus_display_listener_implements(DBusDisplayListener *d= dl, const char *iface) return implements; } =20 +#ifdef WIN32 static bool dbus_display_listener_setup_peer_process(DBusDisplayListener *ddl) { @@ -976,10 +1029,11 @@ dbus_display_listener_setup_d3d11(DBusDisplayListene= r *ddl) static void dbus_display_listener_setup_shared_map(DBusDisplayListener *ddl) { -#ifdef WIN32 g_autoptr(GError) err =3D NULL; =20 - if (!dbus_display_listener_implements(ddl, "org.qemu.Display1.Listener= .Win32.Map")) { +#ifdef WIN32 + if (!dbus_display_listener_implements( + ddl, "org.qemu.Display1.Listener.Win32.Map")) { return; } =20 @@ -999,6 +1053,20 @@ dbus_display_listener_setup_shared_map(DBusDisplayLis= tener *ddl) return; } =20 + ddl->can_share_map =3D true; +#else /* !WIN32 */ + if (!dbus_display_listener_implements( + ddl, "org.qemu.Display1.Listener.Unix.Map")) { + return; + } + ddl->map_proxy =3D qemu_dbus_display1_listener_unix_map_proxy_new_sync( + ddl->conn, G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, NULL, + "/org/qemu/Display1/Listener", NULL, &err); + if (!ddl->map_proxy) { + g_debug("Failed to setup Unix map proxy: %s", err->message); + return; + } + ddl->can_share_map =3D true; #endif } --=20 2.47.0