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

qemu: Add controllers in specified order

Browse Source 
qemu is sensitive to the order of arguments passed. Hence, if a
device requires a controller, the controller cmd string must
precede device cmd string. The same apply for controllers, when
for instance ccid controller requires usb controller. So
controllers create partial ordering in which they should be added
to qemu cmd line.
(cherry picked from commit 0f720ab35a)
This commit is contained in:
Michal Privoznik 2012-11-05 11:51:44 +01:00 committed by Cole Robinson
parent a2e51ac038
commit e1cb1c06ec
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qemu/qemu_command.c
View File

@ -4473,6 +4473,16 @@ qemuBuildCommandLine(virConnectPtr conn,
int usbcontroller = 0; int usbcontroller = 0;
bool usblegacy = false; bool usblegacy = false;
uname_normalize(&ut); uname_normalize(&ut);
int contOrder[] = {
/* We don't add an explicit IDE or FD controller because the
* provided PIIX4 device already includes one. It isn't possible to
* remove the PIIX4. */
VIR_DOMAIN_CONTROLLER_TYPE_USB,
VIR_DOMAIN_CONTROLLER_TYPE_SCSI,
VIR_DOMAIN_CONTROLLER_TYPE_SATA,
VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL,
VIR_DOMAIN_CONTROLLER_TYPE_CCID,
};
VIR_DEBUG("conn=%p driver=%p def=%p mon=%p json=%d " VIR_DEBUG("conn=%p driver=%p def=%p mon=%p json=%d "
"caps=%p migrateFrom=%s migrateFD=%d " "caps=%p migrateFrom=%s migrateFD=%d "
@ -5051,15 +5061,11 @@ qemuBuildCommandLine(virConnectPtr conn,
} }
if (qemuCapsGet(caps, QEMU_CAPS_DEVICE)) { if (qemuCapsGet(caps, QEMU_CAPS_DEVICE)) {
for (j = 0; j < 1; j++) { for (j = 0; j < ARRAY_CARDINALITY(contOrder); j++) {
for (i = 0; i < def->ncontrollers; i++) { for (i = 0; i < def->ncontrollers; i++) {
virDomainControllerDefPtr cont = def->controllers[i]; virDomainControllerDefPtr cont = def->controllers[i];
/* We don't add an explicit IDE or FD controller because the if (cont->type != contOrder[j])
* provided PIIX4 device already includes one. It isn't possible to
* remove the PIIX4. */
if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE ||
cont->type == VIR_DOMAIN_CONTROLLER_TYPE_FDC)
continue; continue;
/* Also, skip USB controllers with type none.*/ /* Also, skip USB controllers with type none.*/