From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 25 Jun 2019 10:59:07 +0000 (+0200)
Subject: util: storage: Fix virStorageSourceGetActualType if volume was not translated
X-Git-Tag: v5.5.0-rc1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dd609114dafa5267e25fc34369f49420db917a1;p=thirdparty%2Flibvirt.git

util: storage: Fix virStorageSourceGetActualType if volume was not translated

virStorageSourceGetActualType would return VIR_STORAGE_TYPE_NONE in case
when a virStorageSource of (top level) type VIR_STORAGE_TYPE_VOLUME was
not prepared to use by the vm by calling
virDomainDiskTranslateSourcePool.

Fix this issue by returning VIR_STORAGE_TYPE_VOLUME in case when the
volume was not translated yet.

Additionally also add documentation for the function describing the
quirk.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index f7495ab6da..269d0050fd 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2430,10 +2430,20 @@ virStorageSourcePoolDefFree(virStorageSourcePoolDefPtr def)
 }
 
 
+/**
+ * virStorageSourceGetActualType:
+ * @def: storage source definition
+ *
+ * Returns type of @def. In case when the type is VIR_STORAGE_TYPE_VOLUME
+ * and virDomainDiskTranslateSourcePool was called on @def the actual type
+ * of the storage volume is returned rather than VIR_STORAGE_TYPE_VOLUME.
+ */
 int
 virStorageSourceGetActualType(const virStorageSource *def)
 {
-    if (def->type == VIR_STORAGE_TYPE_VOLUME && def->srcpool)
+    if (def->type == VIR_STORAGE_TYPE_VOLUME &&
+        def->srcpool &&
+        def->srcpool->actualtype != VIR_STORAGE_TYPE_NONE)
         return def->srcpool->actualtype;
 
     return def->type;