[libvirt] [PATCHv3 23/26] util: storage: Make virStorageFileChainLookup more network storage aware

[Peter Krempa]

Add a few checks and avoid resolving relative links on networked
storage.
---
 src/util/virstoragefile.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 965c3ea..e154f92 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1344,13 +1344,12 @@ virStorageFileChainLookup(virStorageSourcePtr chain,
     const char *tmp;
     char *parentDir = NULL;
     bool nameIsFile = virStorageIsFile(name);
-    size_t i;
+    size_t i = 0;

     if (!parent)
         parent = &tmp;
     *parent = NULL;

-    i = 0;
     if (startFrom) {
         while (chain && chain != startFrom->backingStore) {
             chain = chain->backingStore;
@@ -1371,24 +1370,27 @@ virStorageFileChainLookup(virStorageSourcePtr chain,
             if (STREQ_NULLABLE(name, chain->relPath) ||
                 STREQ(name, chain->path))
                 break;
-            if (nameIsFile && (chain->type == VIR_STORAGE_TYPE_FILE ||
-                               chain->type == VIR_STORAGE_TYPE_BLOCK)) {
-                if (prev) {
-                    if (!(parentDir = mdir_name(prev->path))) {
-                        virReportOOMError();
-                        goto error;
-                    }
-                } else {
-                    if (VIR_STRDUP(parentDir, ".") < 0)
-                        goto error;
+
+            if (nameIsFile && virStorageSourceIsLocalStorage(chain)) {
+                if (prev && virStorageSourceIsLocalStorage(prev))
+                    parentDir = mdir_name(prev->path);
+                else
+                    ignore_value(VIR_STRDUP(parentDir, "."));
+
+                if (!parentDir) {
+                    virReportOOMError();
+                    goto error;
                 }

+
                 int result = virFileRelLinkPointsTo(parentDir, name,
                                                     chain->path);

                 VIR_FREE(parentDir);
+
                 if (result < 0)
                     goto error;
+
                 if (result > 0)
                     break;
             }
@@ -1401,6 +1403,7 @@ virStorageFileChainLookup(virStorageSourcePtr chain,

     if (!chain)
         goto error;
+
     return chain;

  error:
-- 
1.9.3