From 92d99bea060e3d86a6e3b2fdd2df089362303536 Mon Sep 17 00:00:00 2001 Message-Id: <92d99bea060e3d86a6e3b2fdd2df089362303536@dist-git> From: Michal Privoznik Date: Tue, 10 Mar 2020 08:03:12 +0100 Subject: [PATCH] virDomainDiskTranslateSourcePool: Check for disk type correctly When rewriting the virDomainDiskTranslateSourcePool() function in v6.1.0-rc1~184 a typo was introduced. Previously, we allowed startup policy only for those volumes which translated to VIR_STORAGE_TYPE_FILE. But starting with the referenced commit, the value we checked for was changed to VIR_STORAGE_VOL_FILE which comes from a different enum and has a different value too. This is wrong, because virStorageSourceGetActualType() returns a value from the original enum. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1811728 Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa (cherry picked from commit 3918dbd84e4951b43f93fbf50ef52be00274850c) Signed-off-by: Michal Privoznik Message-Id: Acked-by: Peter Krempa --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3a370e6b90..77e3d25a2d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -31610,7 +31610,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def) } if (def->startupPolicy != 0 && - virStorageSourceGetActualType(def->src) != VIR_STORAGE_VOL_FILE) { + virStorageSourceGetActualType(def->src) != VIR_STORAGE_TYPE_FILE) { virReportError(VIR_ERR_XML_ERROR, "%s", _("'startupPolicy' is only valid for " "'file' type volume")); -- 2.25.1