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>
This commit is contained in:
Peter Krempa 2023-08-17 15:36:51 +02:00
parent e0e834a55d
commit 11839c8cc1
4 changed files with 8 additions and 8 deletions

View File

@ -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);

View File

@ -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 */

View File

@ -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;
}

View File

@ -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);
}