conf: Rename 'nodeformat' field of virStorageSource to 'nodenameformat'

While the name itself doesn't matter, this rename is done to prove that
all places using 'nodeformat' 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 ea171f9945c409d8bb674be3cec7725c64e1e2da..f974a521b1f6b2bfc8adccf6cbc9982e664005ef 100644 (file)
--- a/src/conf/storage_source_conf.c
+++ b/src/conf/storage_source_conf.c
@@ -828,7 +828,7 @@ virStorageSourceCopy(const virStorageSource *src,
     def->backingStoreRawFormat = src->backingStoreRawFormat;
     def->snapshot = g_strdup(src->snapshot);
     def->configFile = g_strdup(src->configFile);
-    def->nodeformat = g_strdup(src->nodeformat);
+    def->nodenameformat = g_strdup(src->nodenameformat);
     def->nodenamestorage = g_strdup(src->nodenamestorage);
     def->compat = g_strdup(src->compat);
     def->tlsAlias = g_strdup(src->tlsAlias);
@@ -1169,7 +1169,7 @@ virStorageSourceClear(virStorageSource *def)
     virObjectUnref(def->privateData);
 
     VIR_FREE(def->nodenamestorage);
-    VIR_FREE(def->nodeformat);
+    VIR_FREE(def->nodenameformat);
 
     virStorageSourceBackingStoreClear(def);
 

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

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index fa31028db3c871b677b9c6131b5e4079ccd10754..0d252552de059d2b97e93f06340b7ed8bb69c8ab 100644 (file)
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -81,8 +81,8 @@ void
 qemuBlockStorageSourceSetFormatNodename(virStorageSource *src,
                                         char *nodename)
 {
-    g_free(src->nodeformat);
-    src->nodeformat = nodename;
+    g_free(src->nodenameformat);
+    src->nodenameformat = nodename;
 }
 
 
@@ -96,7 +96,7 @@ qemuBlockStorageSourceSetFormatNodename(virStorageSource *src,
 const char *
 qemuBlockStorageSourceGetEffectiveNodename(virStorageSource *src)
 {
-    return src->nodeformat;
+    return src->nodenameformat;
 }
 
 
@@ -141,7 +141,7 @@ qemuBlockStorageSourceGetStorageNodename(virStorageSource *src)
 const char *
 qemuBlockStorageSourceGetFormatNodename(virStorageSource *src)
 {
-    return src->nodeformat;
+    return src->nodenameformat;
 }
 
 

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 0913a224e350fe2fd0f6e6b413207951da9508a7..4b5b63d287b9ee00ff16e09226bbd333a554a0c0 100644 (file)
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -617,7 +617,7 @@ qemuBlockJobCleanStorageSourceRuntime(virStorageSource *src)
     VIR_FREE(src->relPath);
     VIR_FREE(src->backingStoreRaw);
     VIR_FREE(src->nodenamestorage);
-    VIR_FREE(src->nodeformat);
+    VIR_FREE(src->nodenameformat);
     VIR_FREE(src->tlsAlias);
     VIR_FREE(src->tlsCertdir);
 }