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

Use a separate buffer for <disk><driver>

Browse Source 
Eliminate the big condition at the start.
Instead use a buffer and only format the element if the buffer
is non-empty.
This commit is contained in:
Ján Tomko 2016-08-22 15:31:35 +02:00
parent 51219e11b8
commit d89803d27c
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/conf/domain_conf.c
View File

@ -20972,6 +20972,7 @@ virDomainDiskDefFormat(virBufferPtr buf,
const char *sgio = virDomainDeviceSGIOTypeToString(def->sgio); const char *sgio = virDomainDeviceSGIOTypeToString(def->sgio);
const char *discard = virDomainDiskDiscardTypeToString(def->discard); const char *discard = virDomainDiskDiscardTypeToString(def->discard);
const char *detect_zeroes = virDomainDiskDetectZeroesTypeToString(def->detect_zeroes); const char *detect_zeroes = virDomainDiskDetectZeroesTypeToString(def->detect_zeroes);
virBuffer driverBuf = VIR_BUFFER_INITIALIZER;
if (!type || !def->src->type) { if (!type || !def->src->type) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -21023,35 +21024,33 @@ virDomainDiskDefFormat(virBufferPtr buf,
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
if (def->src->driverName || def->src->format > 0 || def->cachemode || virBufferEscapeString(&driverBuf, " name='%s'", def->src->driverName);
def->error_policy || def->rerror_policy || def->iomode || if (def->src->format > 0)
def->ioeventfd || def->event_idx || def->copy_on_read || virBufferAsprintf(&driverBuf, " type='%s'",
def->discard || def->iothread || def->detect_zeroes) { virStorageFileFormatTypeToString(def->src->format));
if (def->cachemode)
virBufferAsprintf(&driverBuf, " cache='%s'", cachemode);
if (def->error_policy)
virBufferAsprintf(&driverBuf, " error_policy='%s'", error_policy);
if (def->rerror_policy)
virBufferAsprintf(&driverBuf, " rerror_policy='%s'", rerror_policy);
if (def->iomode)
virBufferAsprintf(&driverBuf, " io='%s'", iomode);
if (def->ioeventfd)
virBufferAsprintf(&driverBuf, " ioeventfd='%s'", ioeventfd);
if (def->event_idx)
virBufferAsprintf(&driverBuf, " event_idx='%s'", event_idx);
if (def->copy_on_read)
virBufferAsprintf(&driverBuf, " copy_on_read='%s'", copy_on_read);
if (def->discard)
virBufferAsprintf(&driverBuf, " discard='%s'", discard);
if (def->iothread)
virBufferAsprintf(&driverBuf, " iothread='%u'", def->iothread);
if (def->detect_zeroes)
virBufferAsprintf(&driverBuf, " detect_zeroes='%s'", detect_zeroes);
if (virBufferUse(&driverBuf)) {
virBufferAddLit(buf, "<driver"); virBufferAddLit(buf, "<driver");
virBufferEscapeString(buf, " name='%s'", def->src->driverName); virBufferAddBuffer(buf, &driverBuf);
if (def->src->format > 0)
virBufferAsprintf(buf, " type='%s'",
virStorageFileFormatTypeToString(def->src->format));
if (def->cachemode)
virBufferAsprintf(buf, " cache='%s'", cachemode);
if (def->error_policy)
virBufferAsprintf(buf, " error_policy='%s'", error_policy);
if (def->rerror_policy)
virBufferAsprintf(buf, " rerror_policy='%s'", rerror_policy);
if (def->iomode)
virBufferAsprintf(buf, " io='%s'", iomode);
if (def->ioeventfd)
virBufferAsprintf(buf, " ioeventfd='%s'", ioeventfd);
if (def->event_idx)
virBufferAsprintf(buf, " event_idx='%s'", event_idx);
if (def->copy_on_read)
virBufferAsprintf(buf, " copy_on_read='%s'", copy_on_read);
if (def->discard)
virBufferAsprintf(buf, " discard='%s'", discard);
if (def->iothread)
virBufferAsprintf(buf, " iothread='%u'", def->iothread);
if (def->detect_zeroes)
virBufferAsprintf(buf, " detect_zeroes='%s'", detect_zeroes);
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} }