From nobody Tue Feb 10 10:54:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1541587981189692.7920262544307; Wed, 7 Nov 2018 02:53:01 -0800 (PST) Received: from localhost ([::1]:47129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKLSG-0005DV-1k for importer@patchew.org; Wed, 07 Nov 2018 05:53:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKLP6-00030b-8w for qemu-devel@nongnu.org; Wed, 07 Nov 2018 05:49:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKLP0-0001Zf-2i for qemu-devel@nongnu.org; Wed, 07 Nov 2018 05:49:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:26518) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gKLOz-0000cz-PP for qemu-devel@nongnu.org; Wed, 07 Nov 2018 05:49:37 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 27D22308FB98; Wed, 7 Nov 2018 10:49:28 +0000 (UTC) Received: from diego.redhat.com (unknown [10.40.205.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0BD86608F3; Wed, 7 Nov 2018 10:49:26 +0000 (UTC) From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hr=C3=A1zk=C3=BD?= To: spice-devel@lists.freedesktop.org, qemu-devel@nongnu.org Date: Wed, 7 Nov 2018 11:49:19 +0100 Message-Id: <20181107104921.20536-2-lhrazky@redhat.com> In-Reply-To: <20181107104921.20536-1-lhrazky@redhat.com> References: <20181107104921.20536-1-lhrazky@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Wed, 07 Nov 2018 10:49:28 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH spice v3 1/3] QXL interface: add a function to identify monitors in the guest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Adds a function to let QEMU provide information to identify graphics devices and their monitors in the guest. The function (spice_qxl_set_device_info) sets the device address (e.g. a PCI path) and monitor ID -> device display ID mapping of displays exposed by given QXL interface. Signed-off-by: Luk=C3=A1=C5=A1 Hr=C3=A1zk=C3=BD --- server/red-qxl.c | 44 ++++++++++++++++++++++++++++++++++++++ server/spice-qxl.h | 46 ++++++++++++++++++++++++++++++++++++++++ server/spice-server.syms | 5 +++++ 3 files changed, 95 insertions(+) diff --git a/server/red-qxl.c b/server/red-qxl.c index 97940611..0ea424cd 100644 --- a/server/red-qxl.c +++ b/server/red-qxl.c @@ -41,6 +41,9 @@ #include "red-qxl.h" =20 =20 +#define MAX_DEVICE_ADDRESS_LEN 256 +#define MAX_MONITORS_COUNT 16 + struct QXLState { QXLWorker qxl_worker; QXLInstance *qxl; @@ -53,6 +56,9 @@ struct QXLState { unsigned int max_monitors; RedsState *reds; RedWorker *worker; + char device_address[MAX_DEVICE_ADDRESS_LEN]; + uint32_t device_display_ids[MAX_MONITORS_COUNT]; + size_t monitors_count; // length of ^^^ =20 pthread_mutex_t scanout_mutex; SpiceMsgDisplayGlScanoutUnix scanout; @@ -846,6 +852,44 @@ void red_qxl_gl_draw_async_complete(QXLInstance *qxl) red_qxl_async_complete(qxl, cookie); } =20 +SPICE_GNUC_VISIBLE +void spice_qxl_set_device_info(QXLInstance *instance, + const char *device_address, + uint32_t device_display_id_start, + uint32_t device_display_id_count) +{ + g_return_if_fail(device_address !=3D NULL); + + size_t da_len =3D strnlen(device_address, MAX_DEVICE_ADDRESS_LEN); + if (da_len >=3D MAX_DEVICE_ADDRESS_LEN) { + spice_error("Device address too long: %lu > %u", da_len, MAX_DEVIC= E_ADDRESS_LEN); + return; + } + + if (device_display_id_count > MAX_MONITORS_COUNT) { + spice_error("Device display ID count (%u) is greater than limit %u= ", + device_display_id_count, + MAX_MONITORS_COUNT); + return; + } + + strncpy(instance->st->device_address, device_address, MAX_DEVICE_ADDRE= SS_LEN); + + g_debug("QXL Instance %d setting device address \"%s\" and monitor -> = device display mapping:", + instance->id, + device_address); + + // store the mapping monitor_id -> device_display_id + for (uint32_t monitor_id =3D 0; monitor_id < device_display_id_count; = ++monitor_id) { + uint32_t device_display_id =3D device_display_id_start + monitor_i= d; + instance->st->device_display_ids[monitor_id] =3D device_display_id; + g_debug(" monitor ID %u -> device display ID %u", + monitor_id, device_display_id); + } + + instance->st->monitors_count =3D device_display_id_count; +} + void red_qxl_init(RedsState *reds, QXLInstance *qxl) { QXLState *qxl_state; diff --git a/server/spice-qxl.h b/server/spice-qxl.h index 0c4e75fc..547d3d93 100644 --- a/server/spice-qxl.h +++ b/server/spice-qxl.h @@ -115,6 +115,52 @@ void spice_qxl_gl_draw_async(QXLInstance *instance, uint32_t w, uint32_t h, uint64_t cookie); =20 +/* since spice 0.14.2 */ + +/** + * spice_qxl_set_device_info: + * @instance the QXL instance to set the path to + * @device_address the path of the device this QXL instance belongs to + * @device_display_id_start the starting device display ID of this interfa= ce, + * i.e. the one monitor ID 0 maps to + * @device_display_id_count the total number of device display IDs on this + * interface + * + * Sets the device information for this QXL interface, i.e. the hardware + * address (e.g. PCI) of the graphics device and the IDs of the displays o= f the + * graphics device that are exposed by this interface (device display IDs). + * + * The supported device address format is: + * "pci//./.../." + * + * The "pci" identifies the rest of the string as a PCI address. It is the= only + * supported address at the moment, other identifiers can be introduced la= ter. + * is the PCI domain, followed by . of any PCI br= idges + * in the chain leading to the device. The last . is the + * graphics device. All of , , are hexadecimal nu= mbers + * with the following number of digits: + * : 4 + * : 2 + * : 1 + * + * The device_display_id_{start,count} denotes the sequence of device disp= lay + * IDs that map to the zero-based sequence of monitor IDs provided by moni= tors + * config on this interface. For example with device_display_id_start =3D = 2 and + * device_display_id_count =3D 3 you get the following mapping: + * monitor_id -> device_display_id + * 0 -> 2 + * 1 -> 3 + * 2 -> 4 + * + * Note this example is unsupported in practice. The only supported cases = are + * either a single device display ID (count =3D 1) or multiple device disp= lay IDs + * in a sequence starting from 0. + */ +void spice_qxl_set_device_info(QXLInstance *instance, + const char *device_address, + uint32_t device_display_id_start, + uint32_t device_display_id_count); + typedef struct QXLDevInitInfo { uint32_t num_memslots_groups; uint32_t num_memslots; diff --git a/server/spice-server.syms b/server/spice-server.syms index edf04a42..ac4d9b14 100644 --- a/server/spice-server.syms +++ b/server/spice-server.syms @@ -173,3 +173,8 @@ SPICE_SERVER_0.13.2 { global: spice_server_set_video_codecs; } SPICE_SERVER_0.13.1; + +SPICE_SERVER_0.14.2 { +global: + spice_qxl_set_device_info; +} SPICE_SERVER_0.13.2; --=20 2.19.1