From: Peter Krempa Date: Tue, 14 Jun 2022 12:07:47 +0000 (+0200) Subject: virDomainDiskDefValidateStartupPolicy: Validate disk type better X-Git-Tag: v8.5.0-rc1~70 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b90d0f0a1e4ee52c828fb683c14c14e241e6fcbb;p=thirdparty%2Flibvirt.git virDomainDiskDefValidateStartupPolicy: Validate disk type better Our startup policy checkers work only for local paths, so disk sources such as NVMe, or vhost-user can't be used with startup policy. Unfortunately the validation did not catch these cases. Fix it. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 70e9167eac..9c55d05cac 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -638,7 +638,10 @@ virDomainDiskDefValidateStartupPolicy(const virDomainDiskDef *disk) if (disk->startupPolicy == VIR_DOMAIN_STARTUP_POLICY_DEFAULT) return 0; - if (disk->src->type == VIR_STORAGE_TYPE_NETWORK) { + /* We want to allow any startup policy for un-translated _TYPE_VOLUME disks. + * virStorageSourceGetActualType returns _TYPE_VOLUME in such case */ + if (virStorageSourceGetActualType(disk->src) != VIR_STORAGE_TYPE_VOLUME && + !virStorageSourceIsLocalStorage(disk->src)) { virReportError(VIR_ERR_XML_ERROR, _("disk startupPolicy '%s' is not allowed for disk of '%s' type"), virDomainStartupPolicyTypeToString(disk->startupPolicy),