From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 22 Aug 2016 14:50:45 +0000 (+0200)
Subject: Use a separate buffer for <controller><driver>
X-Git-Tag: v3.3.0-rc1~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e5fc766257b05979c37593434d28cc9eb7e0cf0;p=thirdparty%2Flibvirt.git

Use a separate buffer for <controller><driver>

Make adding new attributes easier.
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 245ea0bd9c..97f00da9d3 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -21216,6 +21216,7 @@ virDomainControllerDefFormat(virBufferPtr buf,
     const char *model = NULL;
     const char *modelName = NULL;
     bool pcihole64 = false, pciModel = false, pciTarget = false;
+    virBuffer driverBuf = VIR_BUFFER_INITIALIZER;
 
     if (!type) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -21320,26 +21321,26 @@ virDomainControllerDefFormat(virBufferPtr buf,
             }
         }
 
-        if (def->queues || def->cmd_per_lun ||
-            def->max_sectors || def->ioeventfd || def->iothread) {
-            virBufferAddLit(buf, "<driver");
-            if (def->queues)
-                virBufferAsprintf(buf, " queues='%u'", def->queues);
+        if (def->queues)
+            virBufferAsprintf(&driverBuf, " queues='%u'", def->queues);
 
-            if (def->cmd_per_lun)
-                virBufferAsprintf(buf, " cmd_per_lun='%u'", def->cmd_per_lun);
+        if (def->cmd_per_lun)
+            virBufferAsprintf(&driverBuf, " cmd_per_lun='%u'", def->cmd_per_lun);
 
-            if (def->max_sectors)
-                virBufferAsprintf(buf, " max_sectors='%u'", def->max_sectors);
+        if (def->max_sectors)
+            virBufferAsprintf(&driverBuf, " max_sectors='%u'", def->max_sectors);
 
-            if (def->ioeventfd) {
-                virBufferAsprintf(buf, " ioeventfd='%s'",
-                                  virTristateSwitchTypeToString(def->ioeventfd));
-            }
+        if (def->ioeventfd) {
+            virBufferAsprintf(&driverBuf, " ioeventfd='%s'",
+                              virTristateSwitchTypeToString(def->ioeventfd));
+        }
 
-            if (def->iothread)
-                virBufferAsprintf(buf, " iothread='%u'", def->iothread);
+        if (def->iothread)
+            virBufferAsprintf(&driverBuf, " iothread='%u'", def->iothread);
 
+        if (virBufferUse(&driverBuf)) {
+            virBufferAddLit(buf, "<driver");
+            virBufferAddBuffer(buf, &driverBuf);
             virBufferAddLit(buf, "/>\n");
         }