domain_conf.c: move virDomainVideoDefValidate() to domain_validate.c

We'll add more video validations into the function in the next
patch. Let's move it beforehand to domain_validate.c.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a61f2890d0ee1b3567f696d1f607b4068956a7ee..90b4b391ec705961d6e8394e33c5146f48b3d7bb 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6612,63 +6612,6 @@ virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev)
 }
 
 
-static int
-virDomainVideoDefValidate(const virDomainVideoDef *video,
-                          const virDomainDef *def)
-{
-    size_t i;
-
-    if (video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("missing video model and cannot determine default"));
-        return -1;
-    }
-
-    /* it doesn't make sense to pair video device type 'none' with any other
-     * types, there can be only a single video device in such case
-     */
-    for (i = 0; i < def->nvideos; i++) {
-        if (def->videos[i]->type == VIR_DOMAIN_VIDEO_TYPE_NONE &&
-            def->nvideos > 1) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("a 'none' video type must be the only video device "
-                             "defined for the domain"));
-            return -1;
-        }
-    }
-
-    switch (video->backend) {
-    case VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER:
-        if (video->type != VIR_DOMAIN_VIDEO_TYPE_VIRTIO) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("'vhostuser' driver is only supported with 'virtio' device"));
-            return -1;
-        }
-        break;
-    case VIR_DOMAIN_VIDEO_BACKEND_TYPE_DEFAULT:
-    case VIR_DOMAIN_VIDEO_BACKEND_TYPE_QEMU:
-        if (video->accel && video->accel->rendernode) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("unsupported rendernode accel attribute without 'vhostuser'"));
-            return -1;
-        }
-        break;
-    case VIR_DOMAIN_VIDEO_BACKEND_TYPE_LAST:
-    default:
-        virReportEnumRangeError(virDomainInputType, video->backend);
-        return -1;
-    }
-
-    if (video->res && (video->res->x == 0 || video->res->y == 0)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("video resolution values must be greater than 0"));
-        return -1;
-    }
-
-    return 0;
-}
-
-
 static int
 virDomainMemoryDefValidate(const virDomainMemoryDef *mem,
                            const virDomainDef *def)

diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index eb2ef6c7fba51e92f7bb1321c6c8d199647d23ab..c81fd296b9c19b98a698b1267225c133361dcbaa 100644 (file)
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -73,3 +73,60 @@ virDomainDefVideoValidate(const virDomainDef *def)
 
     return 0;
 }
+
+
+int
+virDomainVideoDefValidate(const virDomainVideoDef *video,
+                          const virDomainDef *def)
+{
+    size_t i;
+
+    if (video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("missing video model and cannot determine default"));
+        return -1;
+    }
+
+    /* it doesn't make sense to pair video device type 'none' with any other
+     * types, there can be only a single video device in such case
+     */
+    for (i = 0; i < def->nvideos; i++) {
+        if (def->videos[i]->type == VIR_DOMAIN_VIDEO_TYPE_NONE &&
+            def->nvideos > 1) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("a 'none' video type must be the only video device "
+                             "defined for the domain"));
+            return -1;
+        }
+    }
+
+    switch (video->backend) {
+    case VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER:
+        if (video->type != VIR_DOMAIN_VIDEO_TYPE_VIRTIO) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("'vhostuser' driver is only supported with 'virtio' device"));
+            return -1;
+        }
+        break;
+    case VIR_DOMAIN_VIDEO_BACKEND_TYPE_DEFAULT:
+    case VIR_DOMAIN_VIDEO_BACKEND_TYPE_QEMU:
+        if (video->accel && video->accel->rendernode) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("unsupported rendernode accel attribute without 'vhostuser'"));
+            return -1;
+        }
+        break;
+    case VIR_DOMAIN_VIDEO_BACKEND_TYPE_LAST:
+    default:
+        virReportEnumRangeError(virDomainInputType, video->backend);
+        return -1;
+    }
+
+    if (video->res && (video->res->x == 0 || video->res->y == 0)) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("video resolution values must be greater than 0"));
+        return -1;
+    }
+
+    return 0;
+}

diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h
index df4f35c1ddf0dd6ad3843e2e935e3157525d75d2..ed170391f813393e61c942dabfdb93f71159635d 100644 (file)
--- a/src/conf/domain_validate.h
+++ b/src/conf/domain_validate.h
@@ -26,3 +26,5 @@
 
 int virDomainDefBootValidate(const virDomainDef *def);
 int virDomainDefVideoValidate(const virDomainDef *def);
+int virDomainVideoDefValidate(const virDomainVideoDef *video,
+                              const virDomainDef *def);