From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 14 Jul 2020 17:26:42 +0000 (+0200)
Subject: virDomainHostdevDefFormatSubsysSCSI: Avoid ternary operator when formatting address
X-Git-Tag: v6.6.0-rc1~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c7141333280decfbed9cf24326a357cb1c5527e;p=thirdparty%2Flibvirt.git

virDomainHostdevDefFormatSubsysSCSI: Avoid ternary operator when formatting address

Split up formatting of the '<address>' element rather that trying to
optimize it with formatting string hacks.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 873e4cdfe6..bbbb4e47c3 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -26134,11 +26134,13 @@ virDomainHostdevDefFormatSubsysSCSI(virBufferPtr buf,
     } else {
         virBufferAsprintf(&sourceChildBuf, "<adapter name='%s'/>\n",
                           scsihostsrc->adapter);
-        virBufferAsprintf(&sourceChildBuf,
-                          "<address %sbus='%u' target='%u' unit='%llu'/>\n",
-                          includeTypeInAddr ? "type='scsi' " : "",
-                          scsihostsrc->bus, scsihostsrc->target,
-                          scsihostsrc->unit);
+
+        virBufferAddLit(&sourceChildBuf, "<address");
+        if (includeTypeInAddr)
+            virBufferAddLit(&sourceChildBuf, " type='scsi'");
+        virBufferAsprintf(&sourceChildBuf, " bus='%u' target='%u' unit='%llu'",
+                          scsihostsrc->bus, scsihostsrc->target, scsihostsrc->unit);
+        virBufferAddLit(&sourceChildBuf, "/>\n");
     }
 
     virXMLFormatElement(buf, "source", &sourceAttrBuf, &sourceChildBuf);