External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

pci: Remove 'reprobe' parameter from virPCIDeviceUnbind()

Browse Source 
The value is not inspected inside the function, so it makes more
sense for the caller to change the device's setting explicitly.
This commit is contained in:
Andrea Bolognani 2015-10-29 16:09:54 +01:00
parent 51f39c7048
commit e1b2458364
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/util/virpci.c
View File

@ -1037,7 +1037,7 @@ virPCIProbeStubDriver(const char *driver)
}
int
virPCIDeviceUnbind(virPCIDevicePtr dev, bool reprobe)
virPCIDeviceUnbind(virPCIDevicePtr dev)
{
char *path = NULL;
char *drvpath = NULL;
@ -1063,7 +1063,6 @@ virPCIDeviceUnbind(virPCIDevicePtr dev, bool reprobe)
dev->name, driver);
goto cleanup;
}
dev->reprobe = reprobe;
}
ret = 0;
@ -1116,7 +1115,7 @@ virPCIDeviceUnbindFromStub(virPCIDevicePtr dev)
if (!isStub)
goto remove_slot;
if (virPCIDeviceUnbind(dev, dev->reprobe) < 0)
if (virPCIDeviceUnbind(dev) < 0)
goto cleanup;
dev->unbind_from_stub = false;
@ -1230,9 +1229,12 @@ virPCIDeviceBindToStub(virPCIDevicePtr dev)
goto remove_id;
}
if (virPCIDeviceUnbind(dev, reprobe) < 0)
if (virPCIDeviceUnbind(dev) < 0)
goto remove_id;
/* If the device was bound to a driver we'll need to reprobe later */
dev->reprobe = reprobe;
/* If the device isn't already bound to pci-stub, try binding it now.
*/
if (!virFileLinkPointsTo(driverLink, stubDriverPath)) {

2
src/util/virpci.h
View File

@ -201,7 +201,7 @@ int virPCIDeviceAddressParse(char *address, virPCIDeviceAddressPtr bdf);
int virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path,
char **pfname, int *vf_index);
int virPCIDeviceUnbind(virPCIDevicePtr dev, bool reprobe);
int virPCIDeviceUnbind(virPCIDevicePtr dev);
int virPCIDeviceGetDriverPathAndName(virPCIDevicePtr dev,
char **path,
char **name);

2
tests/virpcitest.c
View File

@ -341,7 +341,7 @@ testVirPCIDeviceUnbind(const void *opaque)
if (!dev)
goto cleanup;
if (virPCIDeviceUnbind(dev, false) < 0)
if (virPCIDeviceUnbind(dev) < 0)
goto cleanup;
ret = 0;