mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-25 01:34:11 +03:00
virpci.c: use virPCIDeviceAddressPtr in virPCIDeviceListFindIndex()
We're going to need a way to remove a PCI Device from a list without having a valid virPCIDevicePtr, because the device is missing from the host. This means that virPCIDevicesListDel() must operate with a PCI Device address instead. Turns out that virPCIDevicesListDel() and its related functions only use the virPCIDeviceAddressPtr of the virPCIDevicePtr, so this change is simple to do and will not cause hassle in all other callers. Let's start adapting virPCIDeviceListFindIndex() and crawl our way up to virPCIDevicesListDel(). Reviewed-by: Laine Stump <laine@redhat.com> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
parent
67357e5094
commit
d7d1479fc0
@ -1745,7 +1745,7 @@ virPCIDevicePtr
|
||||
virPCIDeviceListSteal(virPCIDeviceListPtr list,
|
||||
virPCIDevicePtr dev)
|
||||
{
|
||||
return virPCIDeviceListStealIndex(list, virPCIDeviceListFindIndex(list, dev));
|
||||
return virPCIDeviceListStealIndex(list, virPCIDeviceListFindIndex(list, &dev->address));
|
||||
}
|
||||
|
||||
void
|
||||
@ -1756,16 +1756,17 @@ virPCIDeviceListDel(virPCIDeviceListPtr list,
|
||||
}
|
||||
|
||||
int
|
||||
virPCIDeviceListFindIndex(virPCIDeviceListPtr list, virPCIDevicePtr dev)
|
||||
virPCIDeviceListFindIndex(virPCIDeviceListPtr list,
|
||||
virPCIDeviceAddressPtr devAddr)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < list->count; i++) {
|
||||
virPCIDevicePtr other = list->devs[i];
|
||||
if (other->address.domain == dev->address.domain &&
|
||||
other->address.bus == dev->address.bus &&
|
||||
other->address.slot == dev->address.slot &&
|
||||
other->address.function == dev->address.function)
|
||||
if (other->address.domain == devAddr->domain &&
|
||||
other->address.bus == devAddr->bus &&
|
||||
other->address.slot == devAddr->slot &&
|
||||
other->address.function == devAddr->function)
|
||||
return i;
|
||||
}
|
||||
return -1;
|
||||
@ -1798,7 +1799,7 @@ virPCIDeviceListFind(virPCIDeviceListPtr list, virPCIDevicePtr dev)
|
||||
{
|
||||
int idx;
|
||||
|
||||
if ((idx = virPCIDeviceListFindIndex(list, dev)) >= 0)
|
||||
if ((idx = virPCIDeviceListFindIndex(list, &dev->address)) >= 0)
|
||||
return list->devs[idx];
|
||||
else
|
||||
return NULL;
|
||||
|
@ -180,7 +180,7 @@ virPCIDeviceListFindByIDs(virPCIDeviceListPtr list,
|
||||
unsigned int slot,
|
||||
unsigned int function);
|
||||
int virPCIDeviceListFindIndex(virPCIDeviceListPtr list,
|
||||
virPCIDevicePtr dev);
|
||||
virPCIDeviceAddressPtr devAddr);
|
||||
|
||||
/*
|
||||
* Callback that will be invoked once for each file
|
||||
|
Loading…
Reference in New Issue
Block a user