From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 11 Sep 2023 13:46:33 +0000 (+0200)
Subject: conf: Rename 'nodestorage' field of virStorageSource to 'nodenamestorage'
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=02ea7182c228906fcbb6d63b9b0f20666abde87d;p=libvirt.git

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 61a433ab1f..ea171f9945 100644
--- 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 0cd5cd0192..72c6f91f67 100644
--- 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 7355cb0b5e..a2414dc2e3 100644
--- 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 25ac74d6c4..12f3d59df5 100644
--- 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);