From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 29 Aug 2017 16:37:39 +0000 (+0200)
Subject: conf: use virXMLFormatElement for <iommu>
X-Git-Tag: v3.8.0-rc1~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73c336eb466eb5df41c57b1a34f9fec4f82b8717;p=thirdparty%2Flibvirt.git

conf: use virXMLFormatElement for <iommu>

Simplify the formatting function even further.
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 590d90e0a0..ae2e96e964 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -25073,6 +25073,7 @@ virDomainIOMMUDefFormat(virBufferPtr buf,
                         const virDomainIOMMUDef *iommu)
 {
     virBuffer childBuf = VIR_BUFFER_INITIALIZER;
+    virBuffer attrBuf = VIR_BUFFER_INITIALIZER;
     virBuffer driverAttrBuf = VIR_BUFFER_INITIALIZER;
     int ret = -1;
 
@@ -25098,16 +25099,11 @@ virDomainIOMMUDefFormat(virBufferPtr buf,
     if (virXMLFormatElement(&childBuf, "driver", &driverAttrBuf, NULL) < 0)
         goto cleanup;
 
-    virBufferAsprintf(buf, "<iommu model='%s'",
+    virBufferAsprintf(&attrBuf, " model='%s'",
                       virDomainIOMMUModelTypeToString(iommu->model));
 
-    if (virBufferError(&childBuf) != 0 || virBufferUse(&childBuf)) {
-        virBufferAddLit(buf, ">\n");
-        virBufferAddBuffer(buf, &childBuf);
-        virBufferAddLit(buf, "</iommu>\n");
-    } else {
-        virBufferAddLit(buf, "/>\n");
-    }
+    if (virXMLFormatElement(buf, "iommu", &attrBuf, &childBuf) < 0)
+        goto cleanup;
 
     ret = 0;