[libvirt] [PATCH 9/9] virstoragefile: Add node-name

[Matthias Gatto]

Add nodename inside virstoragefile
During xml backingStore parsing, look for a nodename attribute in the disk
declaration if this one is a quorum, if a nodename is found, add it to
the virStorageSource otherwise create a new one with a random name.
Take inspiration from this patch to create the nodename:
http://lists.gnu.org/archive/html/qemu-devel/2014-05/msg03209.html

Durring xml backingStore formating, look for a nodename attribute inside the
virStorageSource struct, and add it to the disk element.

Use the nodename to create the quorum in qemuBuildQuorumStr.

Signed-off-by: Matthias Gatto <matthias.gatto at outscale.com>
---
 src/conf/domain_conf.c    | 25 +++++++++++++++++++++++++
 src/qemu/qemu_command.c   |  3 +++
 src/util/virstoragefile.c |  4 ++++
 src/util/virstoragefile.h |  1 +
 4 files changed, 33 insertions(+)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 9164cf3..a572516 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -53,6 +53,7 @@
 #include "device_conf.h"
 #include "virtpm.h"
 #include "virstring.h"
+#include "virrandom.h"
 
 #define VIR_FROM_THIS VIR_FROM_DOMAIN
 
@@ -5495,6 +5496,8 @@ virDomainDiskThresholdParse(virStorageSourcePtr src,
 }
 
 
+#define GEN_NODE_NAME_PREFIX    "libvirt"
+#define GEN_NODE_NAME_MAX_LEN   (sizeof(GEN_NODE_NAME_PREFIX) + 8 + 8)
 static int
 virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt,
                                virStorageSourcePtr src,
@@ -5506,6 +5509,7 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt,
     xmlNodePtr source = NULL;
     xmlNodePtr cur = NULL;
     char *type = NULL;
+    char *nodeName = NULL;
     char *format = NULL;
     int ret = -1;
     size_t i = 0;
@@ -5539,6 +5543,23 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt,
         goto cleanup;
     }
 
+    if (src->type == VIR_STORAGE_TYPE_QUORUM) {
+        if ((nodeName = virXMLPropString(ctxt->node, "nodename"))) {
+            backingStore->nodeName = nodeName;
+        } else {
+            int len;
+            if (VIR_ALLOC_N(nodeName, GEN_NODE_NAME_MAX_LEN) < 0)
+                goto cleanup;
+            snprintf(nodeName, GEN_NODE_NAME_MAX_LEN,
+                     "%s%08x", GEN_NODE_NAME_PREFIX, (int)pos);
+            len = strlen(nodeName);
+            while (len < GEN_NODE_NAME_MAX_LEN - 1)
+                nodeName[len++] = virRandomInt('Z' - 'A') + 'A';
+            nodeName[GEN_NODE_NAME_MAX_LEN - 1] = '\0';
+            backingStore->nodeName = nodeName;
+        }
+    }
+
     if (!(format = virXPathString("string(./format/@type)", ctxt))) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("missing disk backing store format"));
@@ -5590,6 +5611,8 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt,
     ctxt->node = save_ctxt;
     return ret;
 }
+#undef GEN_NODE_NAME_PREFIX
+#undef GEN_NODE_NAME_MAX_LEN
 
 #define VENDOR_LEN  8
 #define PRODUCT_LEN 16
@@ -16539,6 +16562,8 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
                           type, idx);
         if (backingStore->threshold)
             virBufferAsprintf(buf, " threshold='%lu'", backingStore->threshold);
+        if (backingStore->nodeName)
+            virBufferAsprintf(buf, " nodename='%s'", backingStore->nodeName);
         virBufferAddLit(buf, ">\n");
         virBufferAdjustIndent(buf, 2);
 
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 03ff1b7..77c38c4 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3255,6 +3255,9 @@ qemuBuildQuorumStr(virConnectPtr conn,
                           toAppend, i,
                           virStorageFileFormatTypeToString(backingStore->format));
 
+        virBufferAsprintf(opt, ",%schildren.%lu.node-name=%s",
+                          toAppend, i, backingStore->nodeName);
+
         if (qemuBuildQuorumFileSourceStr(conn, backingStore, opt, tmp) == false)
             goto error;
 
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index ad87e80..cd0098c 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1974,6 +1974,9 @@ virStorageSourceCopy(const virStorageSource *src,
         !(ret->auth = virStorageAuthDefCopy(src->auth)))
         goto error;
 
+    if (src->nodeName && VIR_STRDUP(ret->nodeName, src->nodeName) < 0)
+        goto error;
+
     for (i = 0; i < src->nBackingStores; ++i) {
         if (backingChain && virStorageSourceGetBackingStore(src, i)) {
             if (!virStorageSourceSetBackingStore(ret,
@@ -2119,6 +2122,7 @@ virStorageSourceBackingStoreClear(virStorageSourcePtr def)
 
     VIR_FREE(def->relPath);
     VIR_FREE(def->backingStoreRaw);
+    VIR_FREE(def->nodeName);
 
     /* recursively free backing chain */
     for (i = 0; i < def->nBackingStores; ++i)
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 40d221c..b53dd70 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -274,6 +274,7 @@ struct _virStorageSource {
     virStorageSourcePtr backingStore;
     size_t      nBackingStores;
     size_t      threshold;
+    char        *nodeName;
 
     /* metadata for storage driver access to remote and local volumes */
     virStorageDriverDataPtr drv;
-- 
1.8.3.1