qemu: move validation of video accel to qemu_domain.c

Continue consolidation of video device validation started in previous
patch.

Reviewed-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 6d9bf688cedbc282f098f9cefc0db9c20466e53c..6b9bd96ec984463b96ce8ad68d5d2845300a2caa 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5806,6 +5806,15 @@ qemuDomainDeviceDefValidateVideo(const virDomainVideoDef *video,
                            _("this QEMU does not support 'vhost-user' video device"));
             return -1;
         }
+    } 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))) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("%s 3d acceleration is not supported"),
+                           virDomainVideoTypeToString(video->type));
+            return -1;
+        }
     }
 
     return 0;

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 9e175d17c999d996eb6b05ddcec719f36b086322..72e99651091a2064f784c14f8162508a41f6b6be 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5242,17 +5242,6 @@ qemuProcessStartValidateVideo(virDomainObjPtr vm,
                                virDomainVideoTypeToString(video->type));
                 return -1;
             }
-
-            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))) {
-                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                   _("%s 3d acceleration is not supported"),
-                                   virDomainVideoTypeToString(video->type));
-                    return -1;
-                }
-            }
         }
     }