[libvirt] [RFC PATCH 02/12] util: storage: Add preliminary storage for node names into virStorageSource

[Peter Krempa]

---
 src/libvirt_private.syms  |  1 +
 src/util/virstoragefile.c | 37 +++++++++++++++++++++++++++++++++++++
 src/util/virstoragefile.h |  9 +++++++++
 3 files changed, 47 insertions(+)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 69d1bc860..078cca001 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2476,6 +2476,7 @@ virStorageNetProtocolTypeToString;
 virStorageSourceBackingStoreClear;
 virStorageSourceClear;
 virStorageSourceCopy;
+virStorageSourceFindByNodeName;
 virStorageSourceFree;
 virStorageSourceGetActualType;
 virStorageSourceGetSecurityLabelDef;
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 3e711228b..d8f66a8a1 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2012,6 +2012,7 @@ virStorageSourceCopy(const virStorageSource *src,
         VIR_STRDUP(ret->backingStoreRaw, src->backingStoreRaw) < 0 ||
         VIR_STRDUP(ret->snapshot, src->snapshot) < 0 ||
         VIR_STRDUP(ret->configFile, src->configFile) < 0 ||
+        VIR_STRDUP(ret->nodeName, src->nodeName) < 0 ||
         VIR_STRDUP(ret->compat, src->compat) < 0)
         goto error;

@@ -2232,6 +2233,8 @@ virStorageSourceClear(virStorageSourcePtr def)
     virStorageNetHostDefFree(def->nhosts, def->hosts);
     virStorageAuthDefFree(def->auth);

+    VIR_FREE(def->nodeName);
+
     virStorageSourceBackingStoreClear(def);
 }

@@ -3781,3 +3784,37 @@ virStorageSourceIsRelative(virStorageSourcePtr src)

     return false;
 }
+
+
+/**
+ * virStorageSourceFindByNodeName:
+ * @top: backing chain top
+ * @nodeName: node name to find in backing chain
+ * @index: if provided the index in the backing chain
+ *
+ * Looks up the given storage source in the backing chain and returns the
+ * pointer to it. If @index is passed then it's filled by the index in the
+ * backing chain. On failure NULL is returned and no error is reported.
+ */
+virStorageSourcePtr
+virStorageSourceFindByNodeName(virStorageSourcePtr top,
+                               const char *nodeName,
+                               unsigned int *index)
+{
+    virStorageSourcePtr tmp;
+
+    if (index)
+        *index = 0;
+
+    for (tmp = top; tmp; tmp = tmp->backingStore) {
+        if (STREQ_NULLABLE(tmp->nodeName, nodeName))
+            return tmp;
+
+        if (index)
+            (*index)++;
+    }
+
+    if (index)
+        *index = 0;
+    return NULL;
+}
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 5f6e41911..ffea60075 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -276,6 +276,9 @@ struct _virStorageSource {
     /* Name of the child backing store recorded in metadata of the
      * current file.  */
     char *backingStoreRaw;
+
+    /* metadata that allows identifying given storage source */
+    char *nodeName;
 };


@@ -395,4 +398,10 @@ virStorageSourcePtr virStorageSourceNewFromBackingAbsolute(const char *path);

 bool virStorageSourceIsRelative(virStorageSourcePtr src);

+virStorageSourcePtr
+virStorageSourceFindByNodeName(virStorageSourcePtr top,
+                               const char *nodeName,
+                               unsigned int *index)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
+
 #endif /* __VIR_STORAGE_FILE_H__ */
-- 
2.11.1