From nobody Mon Feb 9 17:57:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.37 as permitted sender) client-ip=209.132.183.37; envelope-from=libvir-list-bounces@redhat.com; helo=mx5-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.37 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx5-phx2.redhat.com (mx5-phx2.redhat.com [209.132.183.37]) by mx.zohomail.com with SMTPS id 1487106489315164.9965654219368; Tue, 14 Feb 2017 13:08:09 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx5-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1EL4d3n057426; Tue, 14 Feb 2017 16:04:39 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1EL4bkA005074 for ; Tue, 14 Feb 2017 16:04:37 -0500 Received: from localhost (ovpn-116-118.phx2.redhat.com [10.3.116.118]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1EL4ZOc029496; Tue, 14 Feb 2017 16:04:36 -0500 From: marcandre.lureau@redhat.com To: libvir-list@redhat.com Date: Wed, 15 Feb 2017 01:04:13 +0400 Message-Id: <20170214210413.23142-6-marcandre.lureau@redhat.com> In-Reply-To: <20170214210413.23142-1-marcandre.lureau@redhat.com> References: <20170214210413.23142-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [libvirt] [PATCH 5/5] qemu: add rendernode argument X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-ZohoMail: RSF_0 Z_629925259 SPT_0 From: Marc-Andr=C3=A9 Lureau Add a new attribute 'rendernode' to spice element. Give it to QEMU if qemu supports it (queued for 2.9). Signed-off-by: Marc-Andr=C3=A9 Lureau --- docs/formatdomain.html.in | 7 +++++- docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 28 ++++++++++++++++++= +--- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 10 ++++++++ .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 2 +- .../qemuxml2argv-video-virtio-gpu-spice-gl.xml | 2 +- tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmlout-video-virtio-gpu-spice-gl.xml | 2 +- 11 files changed, 54 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0a115f5dc..67f486747 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5619,7 +5619,7 @@ qemu-kvm -net nic,model=3D? /dev/null <clipboard copypaste=3D'no'/> <mouse mode=3D'client'/> <filetransfer enable=3D'no'/> - <gl enable=3D'yes'/> + <gl enable=3D'yes' rendernode=3D'/dev/dri/by-path/pci-0000:00:02.0-re= nder'/> </graphics>

Spice supports variable compression settings for audio, imag= es and @@ -5665,6 +5665,11 @@ qemu-kvm -net nic,model=3D? /dev/null the gl element, by setting the enable property. (QEMU only, since 1.3.3).

+

+ By default, QEMU will pick the first available GPU DRM rende= r node. + You may specify a DRM render node path to use instead. (QEMU= only, + since 3.1). +

rdp
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index d715bff29..c5f101325 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3033,6 +3033,11 @@ + + + + + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1bc72a4e9..b577d0aba 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1300,6 +1300,7 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefPtr= def) break; =20 case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: + VIR_FREE(def->data.spice.rendernode); VIR_FREE(def->data.spice.keymap); virDomainGraphicsAuthDefClear(&def->data.spice.auth); break; @@ -12141,6 +12142,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphics= DefPtr def, def->data.spice.filetransfer =3D enableVal; } else if (xmlStrEqual(cur->name, BAD_CAST "gl")) { char *enable =3D virXMLPropString(cur, "enable"); + char *rendernode =3D virXMLPropString(cur, "rendernode"); int enableVal; =20 if (!enable) { @@ -12159,6 +12161,8 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphics= DefPtr def, VIR_FREE(enable); =20 def->data.spice.gl =3D enableVal; + def->data.spice.rendernode =3D rendernode; + } else if (xmlStrEqual(cur->name, BAD_CAST "mouse")) { char *mode =3D virXMLPropString(cur, "mode"); int modeVal; @@ -22839,6 +22843,23 @@ virDomainGraphicsListenDefFormatAddr(virBufferPtr = buf, virBufferAsprintf(buf, " listen=3D'%s'", glisten->address); } =20 +static int +virDomainSpiceGLDefFormat(virBufferPtr buf, virDomainGraphicsDefPtr def) +{ + if (def->data.spice.gl =3D=3D VIR_TRISTATE_BOOL_ABSENT) { + return 0; + } + + virBufferAsprintf(buf, "data.spice.gl)); + + if (def->data.spice.rendernode) + virBufferEscapeString(buf, " rendernode=3D'%s'", def->data.spice.r= endernode); + + virBufferAddLit(buf, "/>\n"); + + return 0; +} =20 static int virDomainGraphicsDefFormat(virBufferPtr buf, @@ -23082,9 +23103,10 @@ virDomainGraphicsDefFormat(virBufferPtr buf, if (def->data.spice.filetransfer) virBufferAsprintf(buf, "\n", virTristateBoolTypeToString(def->data.spice.= filetransfer)); - if (def->data.spice.gl) - virBufferAsprintf(buf, "\n", - virTristateBoolTypeToString(def->data.spice.= gl)); + + if (virDomainSpiceGLDefFormat(buf, def) < 0) { + return -1; + } } =20 if (children) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index dd79206f6..7e1afa475 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1544,6 +1544,7 @@ struct _virDomainGraphicsDef { virTristateBool copypaste; virTristateBool filetransfer; virTristateBool gl; + char *rendernode; } spice; } data; /* nListens, listens, and *port are only useful if type is vnc, diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 399e31447..e851eec7a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -357,6 +357,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, =20 "query-cpu-model-expansion", /* 245 */ "virtio-net.host_mtu", + "spice-rendernode", ); =20 =20 @@ -2950,6 +2951,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCaps= CommandLine[] =3D { { "spice", "unix", QEMU_CAPS_SPICE_UNIX }, { "drive", "throttling.bps-total-max-length", QEMU_CAPS_DRIVE_IOTUNE_M= AX_LENGTH }, { "drive", "throttling.group", QEMU_CAPS_DRIVE_IOTUNE_GROUP }, + { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE }, }; =20 static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 95bb67d44..0f998c473 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -393,6 +393,7 @@ typedef enum { /* 245 */ QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION, /* qmp query-cpu-model-expansion = */ QEMU_CAPS_VIRTIO_NET_HOST_MTU, /* virtio-net-*.host_mtu */ + QEMU_CAPS_SPICE_RENDERNODE, /* -spice rendernode */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c00a47a91..f4bcfd467 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7920,6 +7920,16 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfi= gPtr cfg, * TristateSwitch helper */ virBufferAsprintf(&opt, "gl=3D%s,", virTristateSwitchTypeToString(graphics->data.spi= ce.gl)); + + if (graphics->data.spice.rendernode) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE_RENDERNODE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support spice OpenGL r= endernode")); + goto error; + } + + virBufferAsprintf(&opt, "rendernode=3D%s,", graphics->data.spi= ce.rendernode); + } } =20 if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION)) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.= args b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args index f1ebb62e4..84439cddc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args @@ -19,6 +19,6 @@ QEMU_AUDIO_DRV=3Dspice \ -drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,\ id=3Ddrive-ide0-0-0,cache=3Dnone \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --spice port=3D0,gl=3Don \ +-spice port=3D0,gl=3Don,rendernode=3D/dev/dri/foo \ -device virtio-gpu-pci,id=3Dvideo0,virgl=3Don,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.= xml b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml index b9c7c8af0..fd2580635 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml @@ -26,7 +26,7 @@ - +