]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
virDomainHostdevDefFormatSubsysSCSI: Avoid ternary operator when formatting address
authorPeter Krempa <pkrempa@redhat.com>
Tue, 14 Jul 2020 17:26:42 +0000 (19:26 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 17 Jul 2020 06:22:42 +0000 (08:22 +0200)
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>
src/conf/domain_conf.c

index 873e4cdfe6f90bfded9929d8d87be508d5aa25cb..bbbb4e47c34a93f5a5fb2e20c103dcb47e4cac5d 100644 (file)
@@ -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);