External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-24 13:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: move filesystem target validation

Browse Source 
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>
This commit is contained in:
Ján Tomko 2021-06-16 16:59:42 +02:00
parent fb1289c155
commit 2dabd16588
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/domain_conf.c
View File

@ -9896,12 +9896,6 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt,
goto error; 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 (def->type == VIR_DOMAIN_FS_TYPE_RAM) {
if (!usage) { if (!usage) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",

8
src/conf/domain_validate.c
View File

@ -2036,6 +2036,14 @@ virDomainShmemDefValidate(const virDomainShmemDef *shmem)
static int static int
virDomainFSDefValidate(const virDomainFSDef *fs) 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 && if (fs->info.bootIndex &&
fs->fsdriver != VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) { fs->fsdriver != VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",