External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

conf: Merge virDomainDiskSourceFormatInternal into virDomainDiskSourceFormat

Browse Source 
Remove the wrapper and fix callers.

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:46:54 +01:00
parent 6bee0262c7
commit 5f6f803ca1
5 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/conf/domain_conf.c
View File

@ -23787,13 +23787,13 @@ virDomainStorageSourceFormat(virBufferPtr attrBuf,
} }
static int int
virDomainDiskSourceFormatInternal(virBufferPtr buf, virDomainDiskSourceFormat(virBufferPtr buf,
virStorageSourcePtr src, virStorageSourcePtr src,
int policy, int policy,
unsigned int flags, bool attrIndex,
bool attrIndex, unsigned int flags,
virDomainXMLOptionPtr xmlopt) virDomainXMLOptionPtr xmlopt)
{ {
VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER;
@ -23824,18 +23824,6 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,
} }
int
virDomainDiskSourceFormat(virBufferPtr buf,
virStorageSourcePtr src,
int policy,
unsigned int flags,
virDomainXMLOptionPtr xmlopt)
{
return virDomainDiskSourceFormatInternal(buf, src, policy, flags,
false, xmlopt);
}
static int static int
virDomainDiskBackingStoreFormat(virBufferPtr buf, virDomainDiskBackingStoreFormat(virBufferPtr buf,
virStorageSourcePtr backingStore, virStorageSourcePtr backingStore,
@ -23873,8 +23861,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
virBufferAsprintf(buf, "<format type='%s'/>\n", format); virBufferAsprintf(buf, "<format type='%s'/>\n", format);
if (virDomainDiskSourceFormatInternal(buf, backingStore, 0, flags, if (virDomainDiskSourceFormat(buf, backingStore, 0, false, flags, xmlopt) < 0 ||
false, xmlopt) < 0 ||
virDomainDiskBackingStoreFormat(buf, backingStore->backingStore, virDomainDiskBackingStoreFormat(buf, backingStore->backingStore,
xmlopt, flags) < 0) xmlopt, flags) < 0)
return -1; return -1;
@ -24035,7 +24022,7 @@ virDomainDiskDefFormatMirror(virBufferPtr buf,
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
virBufferEscapeString(buf, "<format type='%s'/>\n", formatStr); virBufferEscapeString(buf, "<format type='%s'/>\n", formatStr);
if (virDomainDiskSourceFormat(buf, disk->mirror, 0, 0, xmlopt) < 0) if (virDomainDiskSourceFormat(buf, disk->mirror, 0, false, 0, xmlopt) < 0)
return -1; return -1;
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</mirror>\n"); virBufferAddLit(buf, "</mirror>\n");
@ -24131,8 +24118,8 @@ virDomainDiskDefFormat(virBufferPtr buf,
if (def->src->auth && !def->src->authInherited) if (def->src->auth && !def->src->authInherited)
virStorageAuthDefFormat(buf, def->src->auth); virStorageAuthDefFormat(buf, def->src->auth);
if (virDomainDiskSourceFormatInternal(buf, def->src, def->startupPolicy, if (virDomainDiskSourceFormat(buf, def->src, def->startupPolicy, true,
flags, true, xmlopt) < 0) flags, xmlopt) < 0)
return -1; return -1;
/* Don't format backingStore to inactive XMLs until the code for /* Don't format backingStore to inactive XMLs until the code for

1
src/conf/domain_conf.h
View File

@ -3014,6 +3014,7 @@ int virDomainDefFormatInternal(virDomainDefPtr def,
int virDomainDiskSourceFormat(virBufferPtr buf, int virDomainDiskSourceFormat(virBufferPtr buf,
virStorageSourcePtr src, virStorageSourcePtr src,
int policy, int policy,
bool attrIndex,
unsigned int flags, unsigned int flags,
virDomainXMLOptionPtr xmlopt); virDomainXMLOptionPtr xmlopt);

2
src/conf/snapshot_conf.c
View File

@ -776,7 +776,7 @@ virDomainSnapshotDiskDefFormat(virBufferPtr buf,
if (disk->src->format > 0) if (disk->src->format > 0)
virBufferEscapeString(buf, "<driver type='%s'/>\n", virBufferEscapeString(buf, "<driver type='%s'/>\n",
virStorageFileFormatTypeToString(disk->src->format)); virStorageFileFormatTypeToString(disk->src->format));
if (virDomainDiskSourceFormat(buf, disk->src, 0, 0, xmlopt) < 0) if (virDomainDiskSourceFormat(buf, disk->src, 0, false, 0, xmlopt) < 0)
return -1; return -1;
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);

2
tests/qemublocktest.c
View File

@ -86,7 +86,7 @@ testBackingXMLjsonXML(const void *args)
return -1; return -1;
} }
if (virDomainDiskSourceFormat(&buf, jsonsrc, 0, 0, NULL) < 0 || if (virDomainDiskSourceFormat(&buf, jsonsrc, 0, false, 0, NULL) < 0 ||
!(actualxml = virBufferContentAndReset(&buf))) { !(actualxml = virBufferContentAndReset(&buf))) {
fprintf(stderr, "failed to format disk source xml\n"); fprintf(stderr, "failed to format disk source xml\n");
return -1; return -1;

2
tests/virstoragetest.c
View File

@ -627,7 +627,7 @@ testBackingParse(const void *args)
goto cleanup; goto cleanup;
} }
if (virDomainDiskSourceFormat(&buf, src, 0, 0, NULL) < 0 || if (virDomainDiskSourceFormat(&buf, src, 0, false, 0, NULL) < 0 ||
!(xml = virBufferContentAndReset(&buf))) { !(xml = virBufferContentAndReset(&buf))) {
fprintf(stderr, "failed to format disk source xml\n"); fprintf(stderr, "failed to format disk source xml\n");
goto cleanup; goto cleanup;