]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
vz: refactoring of prlsdkCreateCt
authorOlga Krishtal <okrishtal@virtuozzo.com>
Thu, 14 Jul 2016 13:52:40 +0000 (16:52 +0300)
committerMaxim Nestratov <mnestratov@virtuozzo.com>
Mon, 18 Jul 2016 20:39:56 +0000 (23:39 +0300)
We do not need to check domainf fs type there,
because it is done in prlsdkCheckUnsupportedParams.

Signed-off-by: Olga Krishtal <okrishtal@virtuozzo.com>
src/vz/vz_sdk.c

index bed5f93a388c761425fed0aefdead030c8fcb3c3..895199299608df89e6485caf89d0f2f2e914dfd2 100644 (file)
@@ -3872,23 +3872,20 @@ prlsdkCreateCt(vzDriverPtr driver, virDomainDefPtr def)
     int useTemplate = 0;
     size_t i;
 
-    if (def->nfss > 1) {
-        /* Check all filesystems */
-        for (i = 0; i < def->nfss; i++) {
-            if (def->fss[i]->type != VIR_DOMAIN_FS_TYPE_FILE) {
-                virReportError(VIR_ERR_INVALID_ARG, "%s",
-                               _("Unsupported filesystem type."));
-                return -1;
-            }
-        }
-    } else if (def->nfss == 1) {
-        if (def->fss[0]->type == VIR_DOMAIN_FS_TYPE_TEMPLATE) {
-            useTemplate = 1;
-        } else if (def->fss[0]->type != VIR_DOMAIN_FS_TYPE_FILE) {
+    for (i = 0; i < def->nfss; i++) {
+        if (useTemplate) {
             virReportError(VIR_ERR_INVALID_ARG, "%s",
-                           _("Unsupported filesystem type."));
+                           _("Unsupported configuration"));
             return -1;
         }
+        if (def->fss[i]->type == VIR_DOMAIN_FS_TYPE_TEMPLATE)
+            useTemplate = 1;
+    }
+
+    if (useTemplate && def->nfss > 1) {
+        virReportError(VIR_ERR_INVALID_ARG, "%s",
+                       _("Unsupported configuration"));
+        return -1;
     }
 
     confParam.nVmType = PVT_CT;