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

qemu: remove qemuDomainPCIAddressReserveNextAddr() 

This function is only called in two places, and the function itself is
just adding a single argument and calling
virDomainPCIAddressReserveNextAddr(), so we can remove it and instead
call virDomainPCIAddressReserveNextAddr() directly. (The main
motivation for doing this is to free up the name so that
qemuDomainPCIAddressReserveNextSlot() can be renamed in the next
patch, as its current name is now inaccurate and misleading).
This commit is contained in:
Laine Stump 2016-10-23 18:11:06 -04:00
parent 27b0f971c4
commit c5aea19d56
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_domain_address.c
View File

@ -934,22 +934,12 @@ qemuDomainFillDevicePCIConnectFlags(virDomainDefPtr def,
}
static int
qemuDomainPCIAddressReserveNextAddr(virDomainPCIAddressSetPtr addrs,
virDomainDeviceInfoPtr dev,
unsigned int function)
{
return virDomainPCIAddressReserveNextAddr(addrs, dev,
dev->pciConnectFlags,
function);
}
static int
qemuDomainPCIAddressReserveNextSlot(virDomainPCIAddressSetPtr addrs,
virDomainDeviceInfoPtr dev)
{
return qemuDomainPCIAddressReserveNextAddr(addrs, dev, -1);
return virDomainPCIAddressReserveNextAddr(addrs, dev,
dev->pciConnectFlags, -1);
}
@ -1688,8 +1678,9 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
} else {
/* This is the first part of the controller, so need
* to find a free slot & then reserve this function */
if (qemuDomainPCIAddressReserveNextAddr(addrs, &cont->info,
addr.function) < 0) {
if (virDomainPCIAddressReserveNextAddr(addrs, &cont->info,
cont->info.pciConnectFlags,
addr.function) < 0) {
goto error;
}