From 2dabd16588cb2e751f7ea8df01b87412d0674017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Wed, 16 Jun 2021 16:59:42 +0200 Subject: [PATCH] conf: move filesystem target validation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Check the presence of the target in the validation phase. Signed-off-by: Ján Tomko Reviewed-by: Peter Krempa --- src/conf/domain_conf.c | 6 ------ src/conf/domain_validate.c | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 139cdfc0a7..f65509d8ec 100644 --- 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 9422b00964..bba5a85657 100644 --- 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",