提交 e1b24583 编写于 作者: A Andrea Bolognani

pci: Remove 'reprobe' parameter from virPCIDeviceUnbind()

The value is not inspected inside the function, so it makes more
sense for the caller to change the device's setting explicitly.
上级 51f39c70
......@@ -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)) {
......
......@@ -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);
......
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册