[libvirt PATCH 3/4] domain_conf: refactor virDomainLoaderDefFormatNvram
Use the new virXMLFormatDirect in order to remove usage of
virXMLFormatInternal.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/conf/domain_conf.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 94f456a362..0bcbf32bb4 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -26980,10 +26980,8 @@ virDomainLoaderDefFormatNvram(virBuffer *buf,
unsigned int flags)
{
g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
- g_auto(virBuffer) childBufDirect = VIR_BUFFER_INITIALIZER;
- g_auto(virBuffer) childBufChild = VIR_BUFFER_INIT_CHILD(buf);
- virBuffer *childBuf = &childBufDirect;
- bool childNewline = false;
+ g_auto(virBuffer) directBuf = VIR_BUFFER_INITIALIZER;
+ g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf);
virBufferEscapeString(&attrBuf, " template='%s'",
loader->nvramTemplate);
@@ -26996,14 +26994,11 @@ virDomainLoaderDefFormatNvram(virBuffer *buf,
virStorageSource *src = loader->nvram;
if (!loader->newStyleNVRAM) {
- virBufferEscapeString(&childBufDirect, "%s", src->path);
+ virBufferEscapeString(&directBuf, "%s", src->path);
} else {
- childNewline = true;
- childBuf = &childBufChild;
-
virBufferAsprintf(&attrBuf, " type='%s'",
virStorageTypeToString(src->type));
- if (virDomainDiskSourceFormat(&childBufChild, src, "source",
0,
+ if (virDomainDiskSourceFormat(&childBuf, src, "source", 0,
false, flags, false, false, xmlopt) < 0)
return -1;
}
@@ -27014,7 +27009,10 @@ virDomainLoaderDefFormatNvram(virBuffer *buf,
}
}
- virXMLFormatElementInternal(buf, "nvram", &attrBuf, childBuf, false,
childNewline);
+ if (virBufferUse(&directBuf) > 0)
+ virXMLFormatElementDirect(buf, "nvram", &attrBuf, &directBuf);
+ else
+ virXMLFormatElement(buf, "nvram", &attrBuf, &childBuf);
return 0;
}
--
2.48.1