From: Han Han <hhan@redhat.com>
Date: Wed, 9 Jun 2021 08:32:24 +0000 (+0800)
Subject: qemu_validate: Validate virtio*gl* devices for 3d accerlation
X-Git-Tag: v7.5.0-rc1~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38aed410ace8b07dc16e04d5036b10f9fcbe3611;p=thirdparty%2Flibvirt.git

qemu_validate: Validate virtio*gl* devices for 3d accerlation

The devices virtio-gpu-gl-pci and virtio-vga-gl, aimed to replace the
virgl property, are valid for 3d accerlation as well.

Signed-off-by: Han Han <hhan@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 669c45b3c5..75e3db6ca9 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -2364,7 +2364,9 @@ qemuValidateDomainDeviceDefVideo(const virDomainVideoDef *video,
     } else if (video->accel) {
         if (video->accel->accel3d == VIR_TRISTATE_SWITCH_ON &&
             (video->type != VIR_DOMAIN_VIDEO_TYPE_VIRTIO ||
-             !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_VIRGL))) {
+             !(virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_VIRGL) ||
+               virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_GL_PCI) ||
+               virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_VGA_GL)))) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("%s 3d acceleration is not supported"),
                            virDomainVideoTypeToString(video->type));