Cole Robinson
1ab72850ed
Fix iptables No chain/target/match by that name (bz #1813830) systemd: start libvirtd after firewalld/iptables services (bz #1697636)
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From: Michal Privoznik <mprivozn@redhat.com>
|
|
Date: Mon, 9 Mar 2020 16:40:57 +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 <mprivozn@redhat.com>
|
|
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
|
|
(cherry picked from commit 3918dbd84e4951b43f93fbf50ef52be00274850c)
|
|
---
|
|
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 17867eeece..fd2e8f4eb5 100644
|
|
--- a/src/conf/domain_conf.c
|
|
+++ b/src/conf/domain_conf.c
|
|
@@ -31746,7 +31746,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"));
|