From: Michal Privoznik <mprivozn@redhat.com>
Date: Sun, 1 Nov 2020 10:08:32 +0000 (+0100)
Subject: virDomainMemorySourceDefFormat: Utilize virXMLFormatElement()
X-Git-Tag: v7.0.0-rc1~312
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c81045376c79ad07f9f25d997d4ba75a7c4443d0;p=thirdparty%2Flibvirt.git

virDomainMemorySourceDefFormat: Utilize virXMLFormatElement()

The virDomainMemorySourceDefFormat() uses good old style of
formatting child buffer (virBufferAdjustIndent()). When switched
to virXMLFormatElement() we can save a couple of lines.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Tested-by: Han Han <hhan@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 2a2cfd24e0..bb0d9f4501 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -27839,37 +27839,32 @@ static int
 virDomainMemorySourceDefFormat(virBufferPtr buf,
                                virDomainMemoryDefPtr def)
 {
+    g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf);
     g_autofree char *bitmap = NULL;
 
-    if (!def->pagesize && !def->sourceNodes && !def->nvdimmPath)
-        return 0;
-
-    virBufferAddLit(buf, "<source>\n");
-    virBufferAdjustIndent(buf, 2);
-
     switch (def->model) {
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
         if (def->sourceNodes) {
             if (!(bitmap = virBitmapFormat(def->sourceNodes)))
                 return -1;
 
-            virBufferAsprintf(buf, "<nodemask>%s</nodemask>\n", bitmap);
+            virBufferAsprintf(&childBuf, "<nodemask>%s</nodemask>\n", bitmap);
         }
 
         if (def->pagesize)
-            virBufferAsprintf(buf, "<pagesize unit='KiB'>%llu</pagesize>\n",
+            virBufferAsprintf(&childBuf, "<pagesize unit='KiB'>%llu</pagesize>\n",
                               def->pagesize);
         break;
 
     case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
-        virBufferEscapeString(buf, "<path>%s</path>\n", def->nvdimmPath);
+        virBufferEscapeString(&childBuf, "<path>%s</path>\n", def->nvdimmPath);
 
         if (def->alignsize)
-            virBufferAsprintf(buf, "<alignsize unit='KiB'>%llu</alignsize>\n",
+            virBufferAsprintf(&childBuf, "<alignsize unit='KiB'>%llu</alignsize>\n",
                               def->alignsize);
 
         if (def->nvdimmPmem)
-            virBufferAddLit(buf, "<pmem/>\n");
+            virBufferAddLit(&childBuf, "<pmem/>\n");
         break;
 
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
@@ -27877,8 +27872,7 @@ virDomainMemorySourceDefFormat(virBufferPtr buf,
         break;
     }
 
-    virBufferAdjustIndent(buf, -2);
-    virBufferAddLit(buf, "</source>\n");
+    virXMLFormatElement(buf, "source", NULL, &childBuf);
 
     return 0;
 }