External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-23 11:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

virDomainDiskDefValidate: Move validation of disk target

Browse Source 
The disk target is mandatory and used as a designator in error messages
of other validation steps, so we must validate it first.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2021-09-07 10:01:39 +02:00
parent cf6b34c683
commit 0404d4fc38
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/conf/domain_validate.c
View File

@ -597,6 +597,20 @@ virDomainDiskDefValidate(const virDomainDef *def,
{ {
virStorageSource *next; virStorageSource *next;
/* disk target is used widely in other code so it must be validated first */
if (!disk->dst) {
if (disk->src->srcpool) {
virReportError(VIR_ERR_NO_TARGET, _("pool = '%s', volume = '%s'"),
disk->src->srcpool->pool,
disk->src->srcpool->volume);
} else {
virReportError(VIR_ERR_NO_TARGET,
disk->src->path ? "%s" : NULL, disk->src->path);
}
return -1;
}
if (virDomainDiskDefValidateSource(disk->src) < 0) if (virDomainDiskDefValidateSource(disk->src) < 0)
return -1; return -1;
@ -776,19 +790,6 @@ virDomainDiskDefValidate(const virDomainDef *def,
if (disk->wwn && !virValidateWWN(disk->wwn)) if (disk->wwn && !virValidateWWN(disk->wwn))
return -1; return -1;
if (!disk->dst) {
if (disk->src->srcpool) {
virReportError(VIR_ERR_NO_TARGET, _("pool = '%s', volume = '%s'"),
disk->src->srcpool->pool,
disk->src->srcpool->volume);
} else {
virReportError(VIR_ERR_NO_TARGET,
disk->src->path ? "%s" : NULL, disk->src->path);
}
return -1;
}
if ((disk->device == VIR_DOMAIN_DISK_DEVICE_DISK || if ((disk->device == VIR_DOMAIN_DISK_DEVICE_DISK ||
disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) && disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) &&
!STRPREFIX(disk->dst, "hd") && !STRPREFIX(disk->dst, "hd") &&