openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: don't reserve slot 1 if a PIIX3 USB controller is defined there 

Applies only to piix3 and check if piix3 controller is on correct
address, or report error
This commit is contained in:
Marc-André Lureau 2011-09-02 22:42:09 +08:00 committed by Daniel Veillard
parent 31710a5389
commit f35bbf7be7
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_command.c
View File

@ -1091,6 +1091,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs)
{ {
int i; int i;
bool reservedIDE = false; bool reservedIDE = false;
bool reservedUSB = false;
bool reservedVGA = false; bool reservedVGA = false;
int function; int function;
@ -1122,6 +1123,13 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs)
def->controllers[i]->info.addr.pci.slot = 1; def->controllers[i]->info.addr.pci.slot = 1;
def->controllers[i]->info.addr.pci.function = 1; def->controllers[i]->info.addr.pci.function = 1;
} }
} else if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB &&
def->controllers[i]->idx == 0 &&
def->controllers[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI &&
def->controllers[i]->info.addr.pci.domain == 0 &&
def->controllers[i]->info.addr.pci.bus == 0 &&
def->controllers[i]->info.addr.pci.slot == 1) {
reservedUSB = true;
} }
} }
@ -1129,7 +1137,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs)
* hardcoded slot=1, multifunction device * hardcoded slot=1, multifunction device
*/ */
for (function = 0; function < QEMU_PCI_ADDRESS_LAST_FUNCTION; function++) { for (function = 0; function < QEMU_PCI_ADDRESS_LAST_FUNCTION; function++) {
if (function == 1 && reservedIDE) if (function == 1 && (reservedIDE || reservedUSB))
/* we have reserved this pci address */ /* we have reserved this pci address */
continue; continue;