External/libvirt
1
0
Fork 0
Code

virDomainHostdevDefFormatSubsysSCSI: Avoid ternary operator when formatting address

Browse Source 
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>
This commit is contained in:
Peter Krempa 2020-07-14 19:26:42 +02:00
parent ccb27a08d5
commit 0c71413332
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/conf/domain_conf.c
View File

@ -26134,11 +26134,13 @@ virDomainHostdevDefFormatSubsysSCSI(virBufferPtr buf,
} else { } else {
virBufferAsprintf(&sourceChildBuf, "<adapter name='%s'/>\n", virBufferAsprintf(&sourceChildBuf, "<adapter name='%s'/>\n",
scsihostsrc->adapter); scsihostsrc->adapter);
virBufferAsprintf(&sourceChildBuf,
"<address %sbus='%u' target='%u' unit='%llu'/>\n", virBufferAddLit(&sourceChildBuf, "<address");
includeTypeInAddr ? "type='scsi' " : "", if (includeTypeInAddr)
scsihostsrc->bus, scsihostsrc->target, virBufferAddLit(&sourceChildBuf, " type='scsi'");
scsihostsrc->unit); virBufferAsprintf(&sourceChildBuf, " bus='%u' target='%u' unit='%llu'",
scsihostsrc->bus, scsihostsrc->target, scsihostsrc->unit);
virBufferAddLit(&sourceChildBuf, "/>\n");
} }
virXMLFormatElement(buf, "source", &sourceAttrBuf, &sourceChildBuf); virXMLFormatElement(buf, "source", &sourceAttrBuf, &sourceChildBuf);