conf: Rename 'nodestorage' field of virStorageSource to 'nodenamestorage'

While the name itself doesn't matter, this rename is done to prove that
all places using 'nodestorage' were converted to the appropriate
accessors.

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

diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c
index 61a433ab1fab4e09b3f218ee408a0aa9a4ef1b37..ea171f9945c409d8bb674be3cec7725c64e1e2da 100644 (file)
--- a/src/conf/storage_source_conf.c
+++ b/src/conf/storage_source_conf.c
@@ -829,7 +829,7 @@ virStorageSourceCopy(const virStorageSource *src,
     def->snapshot = g_strdup(src->snapshot);
     def->configFile = g_strdup(src->configFile);
     def->nodeformat = g_strdup(src->nodeformat);
-    def->nodestorage = g_strdup(src->nodestorage);
+    def->nodenamestorage = g_strdup(src->nodenamestorage);
     def->compat = g_strdup(src->compat);
     def->tlsAlias = g_strdup(src->tlsAlias);
     def->tlsCertdir = g_strdup(src->tlsCertdir);
@@ -1168,7 +1168,7 @@ virStorageSourceClear(virStorageSource *def)
     virStorageAuthDefFree(def->auth);
     virObjectUnref(def->privateData);
 
-    VIR_FREE(def->nodestorage);
+    VIR_FREE(def->nodenamestorage);
     VIR_FREE(def->nodeformat);
 
     virStorageSourceBackingStoreClear(def);

diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h
index 0cd5cd01929246b7bda8c737545581f9054891b3..72c6f91f6732f2099b3c49961b5c977932cb2d92 100644 (file)
--- a/src/conf/storage_source_conf.h
+++ b/src/conf/storage_source_conf.h
@@ -371,7 +371,7 @@ struct _virStorageSource {
 
     /* metadata that allows identifying given storage source */
     char *nodeformat;  /* name of the format handler object */
-    char *nodestorage; /* name of the storage object */
+    char *nodenamestorage; /* name of the storage object */
 
     /* An optional setting to enable usage of TLS for the storage source */
     virTristateBool haveTLS;

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 7355cb0b5e2151a84b49eee6d2501fc40da02d3d..a2414dc2e376070b0b0138555f6c2ae451770fdb 100644 (file)
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -64,8 +64,8 @@ void
 qemuBlockStorageSourceSetStorageNodename(virStorageSource *src,
                                          char *nodename)
 {
-    g_free(src->nodestorage);
-    src->nodestorage = nodename;
+    g_free(src->nodenamestorage);
+    src->nodenamestorage = nodename;
 }
 
 
@@ -83,7 +83,7 @@ qemuBlockStorageSourceGetEffectiveStorageNodename(virStorageSource *src)
         src->sliceStorage->nodename)
         return src->sliceStorage->nodename;
 
-    return src->nodestorage;
+    return src->nodenamestorage;
 }
 
 
@@ -96,7 +96,7 @@ qemuBlockStorageSourceGetEffectiveStorageNodename(virStorageSource *src)
 const char *
 qemuBlockStorageSourceGetStorageNodename(virStorageSource *src)
 {
-    return src->nodestorage;
+    return src->nodenamestorage;
 }
 
 

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 25ac74d6c492443d8e7569415a2bb8f01134a171..12f3d59df581ba9cb82fd531d212441273ebd7d5 100644 (file)
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -612,7 +612,7 @@ qemuBlockJobCleanStorageSourceRuntime(virStorageSource *src)
     src->detected = false;
     VIR_FREE(src->relPath);
     VIR_FREE(src->backingStoreRaw);
-    VIR_FREE(src->nodestorage);
+    VIR_FREE(src->nodenamestorage);
     VIR_FREE(src->nodeformat);
     VIR_FREE(src->tlsAlias);
     VIR_FREE(src->tlsCertdir);