conf: move filesystem target validation

Check the presence of the target in the validation phase.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 139cdfc0a770f3e5eb0beee6bf491cb09887facf..f65509d8ecf5044d22b3787c66f847dfc3a80109 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9896,12 +9896,6 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt,
         goto error;
     }
 
-    if (target == NULL && !sock) {
-        virReportError(VIR_ERR_NO_TARGET,
-                       source ? "%s" : NULL, source);
-        goto error;
-    }
-
     if (def->type == VIR_DOMAIN_FS_TYPE_RAM) {
         if (!usage) {
             virReportError(VIR_ERR_XML_ERROR, "%s",

diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 9422b00964dae4e76d1dbb8a66bc37cd3939f72f..bba5a856574dd4874e04a1f7bcf5a4240b22117b 100644 (file)
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -2036,6 +2036,14 @@ virDomainShmemDefValidate(const virDomainShmemDef *shmem)
 static int
 virDomainFSDefValidate(const virDomainFSDef *fs)
 {
+    if (fs->dst == NULL && !fs->sock) {
+        const char *source = fs->src->path;
+
+        virReportError(VIR_ERR_NO_TARGET,
+                       source ? "%s" : NULL, source);
+        return -1;
+    }
+
     if (fs->info.bootIndex &&
         fs->fsdriver != VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",