[PATCH] Need to squash this into patch

[John Ferlan <jferlan@xxxxxxxxxx>]

Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
---

A libvirtd restart test found that my domain disappeared because there
was no 'expected_secret_usage' type - this this patch needs to be
reviewed as squashed into this patch.

 src/conf/domain_conf.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 36de844..b1ebfc8 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6391,6 +6391,10 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
                         expected_secret_usage = VIR_SECRET_USAGE_TYPE_ISCSI;
                     else if (def->src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD)
                         expected_secret_usage = VIR_SECRET_USAGE_TYPE_CEPH;
+                } else if (def->src->type == VIR_STORAGE_TYPE_VOLUME) {
+                    if (def->src->srcpool &&
+                        def->src->srcpool->pooltype == VIR_STORAGE_POOL_ISCSI)
+                        expected_secret_usage = VIR_SECRET_USAGE_TYPE_ISCSI;
                 }
 
                 startupPolicy = virXMLPropString(cur, "startupPolicy");
-- 
2.1.0

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list