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

conf: eliminate virDomainPCIAddressReserveNextSlot()

Browse Source 
Since we don't actually reserve an entire slot at a time anymore, the
name of this function is just confusing, and it's almost identical in
operation to virDomainPCIAddressReserveNextAddr() anyway, so remove
the *Slot() function and replace calls to it with calls to *Addr(...,
-1).
This commit is contained in:
Laine Stump 2016-10-22 13:28:07 -04:00
parent e97fab2665
commit 43f8147749
4 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/bhyve/bhyve_device.c
View File

@ -100,19 +100,20 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def,
for (i = 0; i < def->nnets; i++) { for (i = 0; i < def->nnets; i++) {
if (!virDeviceInfoPCIAddressWanted(&def->nets[i]->info)) if (!virDeviceInfoPCIAddressWanted(&def->nets[i]->info))
continue; continue;
if (virDomainPCIAddressReserveNextSlot(addrs, if (virDomainPCIAddressReserveNextAddr(addrs, &def->nets[i]->info,
&def->nets[i]->info, VIR_PCI_CONNECT_TYPE_PCI_DEVICE,
VIR_PCI_CONNECT_TYPE_PCI_DEVICE) < 0) -1) < 0) {
goto error; goto error;
}
} }
for (i = 0; i < def->ndisks; i++) { for (i = 0; i < def->ndisks; i++) {
if (def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && if (def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI &&
!virPCIDeviceAddressIsEmpty(&def->disks[i]->info.addr.pci)) !virPCIDeviceAddressIsEmpty(&def->disks[i]->info.addr.pci))
continue; continue;
if (virDomainPCIAddressReserveNextSlot(addrs, if (virDomainPCIAddressReserveNextAddr(addrs, &def->disks[i]->info,
&def->disks[i]->info, VIR_PCI_CONNECT_TYPE_PCI_DEVICE,
VIR_PCI_CONNECT_TYPE_PCI_DEVICE) < 0) -1) < 0)
goto error; goto error;
} }
@ -122,9 +123,10 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def,
!virDeviceInfoPCIAddressWanted(&def->controllers[i]->info)) !virDeviceInfoPCIAddressWanted(&def->controllers[i]->info))
continue; continue;
if (virDomainPCIAddressReserveNextSlot(addrs, if (virDomainPCIAddressReserveNextAddr(addrs,
&def->controllers[i]->info, &def->controllers[i]->info,
VIR_PCI_CONNECT_TYPE_PCI_DEVICE) < 0) VIR_PCI_CONNECT_TYPE_PCI_DEVICE,
-1) < 0)
goto error; goto error;
} }

11
src/conf/domain_addr.c
View File

@ -629,7 +629,7 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs,
ret = virDomainPCIAddressReserveAddr(addrs, &dev->addr.pci, ret = virDomainPCIAddressReserveAddr(addrs, &dev->addr.pci,
flags, true); flags, true);
} else { } else {
ret = virDomainPCIAddressReserveNextSlot(addrs, dev, flags); ret = virDomainPCIAddressReserveNextAddr(addrs, dev, flags, -1);
} }
cleanup: cleanup:
@ -897,15 +897,6 @@ virDomainPCIAddressReserveNextAddr(virDomainPCIAddressSetPtr addrs,
} }
int
virDomainPCIAddressReserveNextSlot(virDomainPCIAddressSetPtr addrs,
virDomainDeviceInfoPtr dev,
virDomainPCIConnectFlags flags)
{
return virDomainPCIAddressReserveNextAddr(addrs, dev, flags, -1);
}
static int static int
virDomainPCIAddressSetMultiIter(virDomainDefPtr def ATTRIBUTE_UNUSED, virDomainPCIAddressSetMultiIter(virDomainDefPtr def ATTRIBUTE_UNUSED,
virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED,

5
src/conf/domain_addr.h
View File

@ -180,11 +180,6 @@ int virDomainPCIAddressReserveNextAddr(virDomainPCIAddressSetPtr addrs,
int function) int function)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int virDomainPCIAddressReserveNextSlot(virDomainPCIAddressSetPtr addrs,
virDomainDeviceInfoPtr dev,
virDomainPCIConnectFlags flags)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
void virDomainPCIAddressSetAllMulti(virDomainDefPtr def) void virDomainPCIAddressSetAllMulti(virDomainDefPtr def)
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);

1
src/libvirt_private.syms
View File

@ -102,7 +102,6 @@ virDomainPCIAddressFlagsCompatible;
virDomainPCIAddressReleaseSlot; virDomainPCIAddressReleaseSlot;
virDomainPCIAddressReserveAddr; virDomainPCIAddressReserveAddr;
virDomainPCIAddressReserveNextAddr; virDomainPCIAddressReserveNextAddr;
virDomainPCIAddressReserveNextSlot;
virDomainPCIAddressReserveSlot; virDomainPCIAddressReserveSlot;
virDomainPCIAddressSetAllMulti; virDomainPCIAddressSetAllMulti;
virDomainPCIAddressSetAlloc; virDomainPCIAddressSetAlloc;