External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 14:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Remove @seclabels from virDomainStorageSourceFormat

Browse Source 
All callers including transitive callers through
virDomainDiskSourceFormatInternal always pass true. Remove the argument.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-03-20 11:18:44 +01:00
parent da9f3cd84b
commit 6bee0262c7
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/conf/domain_conf.c
View File

@ -23720,8 +23720,7 @@ int
virDomainStorageSourceFormat(virBufferPtr attrBuf,
virBufferPtr childBuf,
virStorageSourcePtr src,
unsigned int flags,
bool seclabels)
unsigned int flags)
{
switch ((virStorageType)src->type) {
case VIR_STORAGE_TYPE_FILE:
@ -23761,7 +23760,7 @@ virDomainStorageSourceFormat(virBufferPtr attrBuf,
return -1;
}
if (seclabels && src->type != VIR_STORAGE_TYPE_NETWORK)
if (src->type != VIR_STORAGE_TYPE_NETWORK)
virDomainSourceDefFormatSeclabel(childBuf, src->nseclabels,
src->seclabels, flags);
@ -23793,7 +23792,6 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,
virStorageSourcePtr src,
int policy,
unsigned int flags,
bool seclabels,
bool attrIndex,
virDomainXMLOptionPtr xmlopt)
{
@ -23803,8 +23801,7 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,
virBufferSetChildIndent(&childBuf, buf);
if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, flags,
seclabels) < 0)
if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, flags) < 0)
goto cleanup;
if (policy && src->type != VIR_STORAGE_TYPE_NETWORK)
@ -23834,7 +23831,7 @@ virDomainDiskSourceFormat(virBufferPtr buf,
unsigned int flags,
virDomainXMLOptionPtr xmlopt)
{
return virDomainDiskSourceFormatInternal(buf, src, policy, flags, true,
return virDomainDiskSourceFormatInternal(buf, src, policy, flags,
false, xmlopt);
}
@ -23876,7 +23873,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
virBufferAdjustIndent(buf, 2);
virBufferAsprintf(buf, "<format type='%s'/>\n", format);
if (virDomainDiskSourceFormatInternal(buf, backingStore, 0, flags, true,
if (virDomainDiskSourceFormatInternal(buf, backingStore, 0, flags,
false, xmlopt) < 0 ||
virDomainDiskBackingStoreFormat(buf, backingStore->backingStore,
xmlopt, flags) < 0)
@ -24135,7 +24132,7 @@ virDomainDiskDefFormat(virBufferPtr buf,
virStorageAuthDefFormat(buf, def->src->auth);
if (virDomainDiskSourceFormatInternal(buf, def->src, def->startupPolicy,
flags, true, true, xmlopt) < 0)
flags, true, xmlopt) < 0)
return -1;
/* Don't format backingStore to inactive XMLs until the code for

3
src/conf/domain_conf.h
View File

@ -3459,8 +3459,7 @@ int virDomainDiskDefCheckDuplicateInfo(const virDomainDiskDef *a,
int virDomainStorageSourceFormat(virBufferPtr attrBuf,
virBufferPtr childBuf,
virStorageSourcePtr src,
unsigned int flags,
bool seclabels)
unsigned int flags)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
int virDomainStorageSourceParse(xmlNodePtr node,

2
src/qemu/qemu_domain.c
View File

@ -2358,7 +2358,7 @@ qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBufferPtr buf,
virStorageFileFormatTypeToString(src->format));
if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src,
VIR_DOMAIN_DEF_FORMAT_STATUS, true) < 0)
VIR_DOMAIN_DEF_FORMAT_STATUS) < 0)
goto cleanup;
if (qemuStorageSourcePrivateDataFormat(src, &privateDataBuf) < 0)