[PATCH 07/23] conf: Refactor formatting of 'driver' in virDomainRNGDefFormat

[Peter Krempa <pkrempa@xxxxxxxxxx>]

Use virXMLFormatElement to format the internals along with simplifying
cleanup code paths.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/conf/domain_conf.c | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 766846a557..71e0c8679b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -25982,8 +25982,7 @@ virDomainRNGDefFormat(virBufferPtr buf,
 {
     const char *model = virDomainRNGModelTypeToString(def->model);
     const char *backend = virDomainRNGBackendTypeToString(def->backend);
-    virBuffer driverBuf = VIR_BUFFER_INITIALIZER;
-    int ret = -1;
+    VIR_AUTOCLEAN(virBuffer) driverAttrBuf = VIR_BUFFER_INITIALIZER;

     virBufferAsprintf(buf, "<rng model='%s'>\n", model);
     virBufferAdjustIndent(buf, 2);
@@ -26002,11 +26001,11 @@ virDomainRNGDefFormat(virBufferPtr buf,

     case VIR_DOMAIN_RNG_BACKEND_EGD:
         if (virDomainChrAttrsDefFormat(buf, def->source.chardev, false) < 0)
-            goto cleanup;
+            return -1;
         virBufferAddLit(buf, ">\n");
         virBufferAdjustIndent(buf, 2);
         if (virDomainChrSourceDefFormat(buf, def->source.chardev, flags) < 0)
-            goto cleanup;
+            return -1;
         virBufferAdjustIndent(buf, -2);
         virBufferAddLit(buf, "</backend>\n");

@@ -26014,28 +26013,18 @@ virDomainRNGDefFormat(virBufferPtr buf,
         break;
     }

-    virDomainVirtioOptionsFormat(&driverBuf, def->virtio);
-    if (virBufferCheckError(&driverBuf) < 0)
-        goto cleanup;
+    virDomainVirtioOptionsFormat(&driverAttrBuf, def->virtio);

-    if (virBufferUse(&driverBuf)) {
-        virBufferAddLit(buf, "<driver");
-        virBufferAddBuffer(buf, &driverBuf);
-        virBufferAddLit(buf, "/>\n");
-    }
+    if (virXMLFormatElement(buf, "driver", &driverAttrBuf, NULL) < 0)
+        return -1;

     if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0)
-        goto cleanup;
+        return -1;

     virBufferAdjustIndent(buf, -2);
     virBufferAddLit(buf, "</rng>\n");

-    ret = 0;
-
- cleanup:
-    virBufferFreeAndReset(&driverBuf);
-
-    return ret;
+    return 0;
 }

 void
-- 
2.20.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list