shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 09:17:52 +03:00
Code Releases Activity

qemu: use virDomainPCIAddressReserveNextAddr in qemuDomainAssignDevicePCISlots

Browse Source 
instead of calling virDomainPCIAddressGetNextSlot() (which I want to
turn into a local static in domain_addr.c).
This commit is contained in:
Laine Stump 2016-09-01 11:23:06 -04:00
parent 848e7ff2b3
commit a0bb224cf5
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/qemu/qemu_domain_address.c
View File

@ -1005,7 +1005,6 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
{
size_t i, j;
virDomainPCIConnectFlags flags = 0; /* initialize to quiet gcc warning */
virPCIDeviceAddress tmp_addr;
/* PCI controllers */
for (i = 0; i < def->ncontrollers; i++) {
@ -1115,7 +1114,6 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
virPCIDeviceAddress addr = {0};
bool foundAddr = false;
memset(&tmp_addr, 0, sizeof(tmp_addr));
for (j = 0; j < def->ncontrollers; j++) {
if (IS_USB2_CONTROLLER(def->controllers[j]) &&
def->controllers[j]->idx == cont->idx &&
@ -1145,26 +1143,25 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
break;
}
if (!foundAddr) {
/* This is the first part of the controller, so need
* to find a free slot & then reserve a function */
if (virDomainPCIAddressGetNextSlot(addrs, &tmp_addr, flags) < 0)
if (foundAddr) {
/* Reserve this function on the slot we found */
if (virDomainPCIAddressReserveAddr(addrs, &addr, flags,
false, true) < 0)
goto error;
addr.bus = tmp_addr.bus;
addr.slot = tmp_addr.slot;
cont->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
cont->info.addr.pci = addr;
} else {
/* This is the first part of the controller, so need
* to find a free slot & then reserve this function */
if (virDomainPCIAddressReserveNextAddr(addrs, &cont->info,
flags, addr.function,
false) < 0) {
goto error;
}
addrs->lastaddr = addr;
addrs->lastaddr.function = 0;
addrs->lastaddr.multi = VIR_TRISTATE_SWITCH_ABSENT;
cont->info.addr.pci.multi = addr.multi;
}
/* Finally we can reserve the slot+function */
if (virDomainPCIAddressReserveAddr(addrs, &addr, flags,
false, foundAddr) < 0)
goto error;
cont->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
cont->info.addr.pci = addr;
} else {
if (virDomainPCIAddressReserveNextSlot(addrs,
&cont->info, flags) < 0) {