External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-26 23:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: eliminate monster condition in virDomainControllerDefFormat

Browse Source 
Move most of the subelement formatting out of the giant if.
This commit is contained in:
Ján Tomko 2017-05-26 18:13:59 +02:00
parent 1a4b21f1c6
commit 583022e52e
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/conf/domain_conf.c
View File

@ -21479,11 +21479,7 @@ virDomainControllerDefFormat(virBufferPtr buf,
break; break;
} }
if (pciModel || pciTarget || if (pciModel || pciTarget) {
def->queues || def->cmd_per_lun || def->max_sectors || def->ioeventfd ||
def->iothread ||
virDomainDeviceInfoNeedsFormat(&def->info, flags) || pcihole64) {
if (pciModel) { if (pciModel) {
modelName = virDomainControllerPCIModelNameTypeToString(def->opts.pciopts.modelName); modelName = virDomainControllerPCIModelNameTypeToString(def->opts.pciopts.modelName);
if (!modelName) { if (!modelName) {
@ -21520,17 +21516,17 @@ virDomainControllerDefFormat(virBufferPtr buf,
virBufferAddLit(&childBuf, "</target>\n"); virBufferAddLit(&childBuf, "</target>\n");
} }
} }
}
virDomainControllerDriverFormat(&childBuf, def); virDomainControllerDriverFormat(&childBuf, def);
if (virDomainDeviceInfoNeedsFormat(&def->info, flags) && if (virDomainDeviceInfoNeedsFormat(&def->info, flags) &&
virDomainDeviceInfoFormat(&childBuf, &def->info, flags) < 0) virDomainDeviceInfoFormat(&childBuf, &def->info, flags) < 0)
return -1; return -1;
if (pcihole64) { if (pcihole64) {
virBufferAsprintf(&childBuf, "<pcihole64 unit='KiB'>%lu</" virBufferAsprintf(&childBuf, "<pcihole64 unit='KiB'>%lu</"
"pcihole64>\n", def->opts.pciopts.pcihole64size); "pcihole64>\n", def->opts.pciopts.pcihole64size);
}
} }
if (virBufferUse(&childBuf)) { if (virBufferUse(&childBuf)) {