NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

conf: Refactor formatting of startupPolicy in virDomainDiskSourceFormatInternal

Browse Source 
Move it to a single location which also allows to get rid of the
temporrary variable.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Peter Krempa 2018-03-07 17:45:56 +01:00
parent 8f5138829f
commit 2bbbc9798d
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/conf/domain_conf.c
View File

@ -22806,29 +22806,22 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,
bool skipSeclabels, bool skipSeclabels,
virDomainXMLOptionPtr xmlopt) virDomainXMLOptionPtr xmlopt)
{ {
const char *startupPolicy = NULL;
virBuffer attrBuf = VIR_BUFFER_INITIALIZER; virBuffer attrBuf = VIR_BUFFER_INITIALIZER;
virBuffer childBuf = VIR_BUFFER_INITIALIZER; virBuffer childBuf = VIR_BUFFER_INITIALIZER;
virBufferSetChildIndent(&childBuf, buf); virBufferSetChildIndent(&childBuf, buf);
if (policy)
startupPolicy = virDomainStartupPolicyTypeToString(policy);
switch ((virStorageType)src->type) { switch ((virStorageType)src->type) {
case VIR_STORAGE_TYPE_FILE: case VIR_STORAGE_TYPE_FILE:
virBufferEscapeString(&attrBuf, " file='%s'", src->path); virBufferEscapeString(&attrBuf, " file='%s'", src->path);
virBufferEscapeString(&attrBuf, " startupPolicy='%s'", startupPolicy);
break; break;
case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_BLOCK:
virBufferEscapeString(&attrBuf, " dev='%s'", src->path); virBufferEscapeString(&attrBuf, " dev='%s'", src->path);
virBufferEscapeString(&attrBuf, " startupPolicy='%s'", startupPolicy);
break; break;
case VIR_STORAGE_TYPE_DIR: case VIR_STORAGE_TYPE_DIR:
virBufferEscapeString(&attrBuf, " dir='%s'", src->path); virBufferEscapeString(&attrBuf, " dir='%s'", src->path);
virBufferEscapeString(&attrBuf, " startupPolicy='%s'", startupPolicy);
break; break;
case VIR_STORAGE_TYPE_NETWORK: case VIR_STORAGE_TYPE_NETWORK:
@ -22846,7 +22839,6 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,
virBufferAsprintf(&attrBuf, " mode='%s'", virBufferAsprintf(&attrBuf, " mode='%s'",
virStorageSourcePoolModeTypeToString(src->srcpool->mode)); virStorageSourcePoolModeTypeToString(src->srcpool->mode));
} }
virBufferEscapeString(&attrBuf, " startupPolicy='%s'", startupPolicy);
break; break;
@ -22858,6 +22850,10 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,
} }
if (src->type != VIR_STORAGE_TYPE_NETWORK) { if (src->type != VIR_STORAGE_TYPE_NETWORK) {
if (policy)
virBufferEscapeString(&attrBuf, " startupPolicy='%s'",
virDomainStartupPolicyTypeToString(policy));
if (!skipSeclabels) if (!skipSeclabels)
virDomainSourceDefFormatSeclabel(&childBuf, src->nseclabels, virDomainSourceDefFormatSeclabel(&childBuf, src->nseclabels,
src->seclabels, flags); src->seclabels, flags);