From nobody Thu Nov 6 08:24:35 2025 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 1539787197252618.0468410483575; Wed, 17 Oct 2018 07:39:57 -0700 (PDT) Received: from localhost ([::1]:37049 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCmzL-0004FO-8y for importer@patchew.org; Wed, 17 Oct 2018 10:39:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCmvy-0001XL-Cj for qemu-devel@nongnu.org; Wed, 17 Oct 2018 10:36:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCmvn-0007vk-DN for qemu-devel@nongnu.org; Wed, 17 Oct 2018 10:36:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45334) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gCmvm-0007uu-Vo for qemu-devel@nongnu.org; Wed, 17 Oct 2018 10:36:15 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8F95080F6D; Wed, 17 Oct 2018 14:36:13 +0000 (UTC) Received: from diego.redhat.com (unknown [10.40.205.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52B221057054; Wed, 17 Oct 2018 14:36:12 +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, 17 Oct 2018 16:36:04 +0200 Message-Id: <20181017143604.5194-3-lhrazky@redhat.com> In-Reply-To: <20181017143604.5194-1-lhrazky@redhat.com> References: <20181017143604.5194-1-lhrazky@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 17 Oct 2018 14:36:13 +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 qemu v2 2/2] spice: set device address and device display ID in QXL interface 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" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Calls new SPICE QXL interface functions to set: * The hardware address of the graphics device represented by the QXL interface (e.g. a PCI path): spice_qxl_set_device_address(...) * The device display IDs (the IDs of the device's monitors that belong to this QXL interface): spice_qxl_monitor_set_device_display_id(...) Signed-off-by: Luk=C3=A1=C5=A1 Hr=C3=A1zk=C3=BD --- hw/display/qxl.c | 8 ++++++++ ui/spice-core.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- ui/spice-display.c | 5 +++++ 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/hw/display/qxl.c b/hw/display/qxl.c index f608abc769..63144f42b4 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2184,6 +2184,14 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Er= ror **errp) SPICE_INTERFACE_QXL_MAJOR, SPICE_INTERFACE_QXL_MINOR); return; } + +#if SPICE_SERVER_VERSION >=3D 0x000e02 /* release 0.14.2 */ + // register all possible device display IDs to SPICE server + for (int i =3D 0; i < qxl->max_outputs; ++i) { + spice_qxl_monitor_set_device_display_id(&qxl->ssd.qxl, i, i); + } +#endif + qemu_add_vm_change_state_handler(qxl_vm_change_state_handler, qxl); =20 qxl->update_irq =3D qemu_bh_new(qxl_update_irq_bh, qxl); diff --git a/ui/spice-core.c b/ui/spice-core.c index a4fbbc3898..2e01beea03 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -35,6 +35,8 @@ #include "qemu/option.h" #include "migration/misc.h" #include "hw/hw.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_bus.h" #include "ui/spice-display.h" =20 /* core bits */ @@ -871,6 +873,26 @@ bool qemu_spice_have_display_interface(QemuConsole *co= n) return false; } =20 +/* + * Recursively (in reverse order) appends addresses of PCI devices as it m= oves + * up in the PCI hierarchy. + * + * @returns true on success, false when the buffer wasn't large enough + */ +static bool append_pci_address_recursive(char *buf, size_t buf_size, const= PCIDevice *pci) +{ + PCIBus *bus =3D pci_get_bus(pci); + if (!pci_bus_is_root(bus)) { + append_pci_address_recursive(buf, buf_size, bus->parent_dev); + } + + size_t len =3D strlen(buf); + size_t written =3D snprintf(buf + len, buf_size - len, "/%02x.%x", + PCI_SLOT(pci->devfn), PCI_FUNC(pci->devfn)); + + return written > 0 && written < buf_size - len; +} + int qemu_spice_add_display_interface(QXLInstance *qxlin, QemuConsole *con) { if (g_slist_find(spice_consoles, con)) { @@ -878,7 +900,28 @@ int qemu_spice_add_display_interface(QXLInstance *qxli= n, QemuConsole *con) } qxlin->id =3D qemu_console_get_index(con); spice_consoles =3D g_slist_append(spice_consoles, con); - return qemu_spice_add_interface(&qxlin->base); + int res =3D qemu_spice_add_interface(&qxlin->base); + +#if SPICE_SERVER_VERSION >=3D 0x000e02 /* release 0.14.2 */ + DeviceState *dev =3D DEVICE(object_property_get_link(OBJECT(con), "dev= ice", &error_abort)); + PCIDevice *pci =3D (PCIDevice *) object_dynamic_cast(OBJECT(dev), TYPE= _PCI_DEVICE); + + if (pci =3D=3D NULL) { + warn_report("Setting PCI path of a display device to SPICE: Not a = PCI device."); + return res; + } + + char device_path[128] =3D "pci/0000"; // hardcoded PCI domain 0000 + if (!append_pci_address_recursive(device_path, sizeof(device_path), pc= i)) { + warn_report("Setting PCI path of a display device to SPICE: " + "Too many PCI devices in the chain."); + return res; + } + + spice_qxl_set_device_address(qxlin, device_path); +#endif + + return res; } =20 static int qemu_spice_set_ticket(bool fail_if_conn, bool disconnect_if_con= n) diff --git a/ui/spice-display.c b/ui/spice-display.c index 2f8adb6b9f..f620750803 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -1129,6 +1129,11 @@ static void qemu_spice_display_init_one(QemuConsole = *con) =20 ssd->qxl.base.sif =3D &dpy_interface.base; qemu_spice_add_display_interface(&ssd->qxl, con); + +#if SPICE_SERVER_VERSION >=3D 0x000e02 /* release 0.14.2 */ + spice_qxl_monitor_set_device_display_id(&ssd->qxl, 0, qemu_console_get= _head(con)); +#endif + qemu_spice_create_host_memslot(ssd); =20 register_displaychangelistener(&ssd->dcl); --=20 2.19.1