External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

qemu: Clean up qemuBuildControllerDevCommandLine()

Browse Source 
Add a 'cleanup' label and improve the readability of one of the
checks by making it conform to our formatting standard and moving
the corresponding comment.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Laine Stump <laine@laine.org>
This commit is contained in:
Andrea Bolognani 2017-09-04 18:05:43 +02:00
parent dfbb15b754
commit 1a81722921
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_command.c
View File

@ -3125,6 +3125,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd,
VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL,
VIR_DOMAIN_CONTROLLER_TYPE_CCID,
};
int ret = -1;
for (j = 0; j < ARRAY_CARDINALITY(contOrder); j++) {
for (i = 0; i < def->ncontrollers; i++) {
@ -3186,7 +3187,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Multiple legacy USB controllers are "
"not supported"));
return -1;
goto cleanup;
}
usblegacy = true;
continue;
@ -3194,7 +3195,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd,
if (qemuBuildControllerDevStr(def, cont, qemuCaps,
&devstr, &usbcontroller) < 0)
return -1;
goto cleanup;
if (devstr) {
virCommandAddArg(cmd, "-device");
@ -3204,16 +3205,20 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd,
}
}
/* We haven't added any USB controller yet, but we haven't been asked
* not to add one either. Add a legacy USB controller, unless we're
* creating a kind of guest we want to keep legacy-free */
if (usbcontroller == 0 &&
!qemuDomainIsQ35(def) &&
!qemuDomainIsVirt(def) &&
!ARCH_IS_S390(def->os.arch))
!ARCH_IS_S390(def->os.arch)) {
/* We haven't added any USB controller yet, but we haven't been asked
* not to add one either. Add a legacy USB controller, unless we're
* creating a kind of guest we want to keep legacy-free */
virCommandAddArg(cmd, "-usb");
}
return 0;
ret = 0;
cleanup:
return ret;
}