mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-22 22:13:18 +00:00
Remove redundant duplicated 'Hostdev' string method names
Some virHostdevXXXX methods included the string Hostdev again as a suffix. Change the latter to Device instead. Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
parent
7be4bddea1
commit
e9a60dcc7c
@ -1306,11 +1306,11 @@ virHostdevPreparePCIDevices;
|
||||
virHostdevPrepareSCSIDevices;
|
||||
virHostdevPrepareUSBDevices;
|
||||
virHostdevReAttachPCIDevices;
|
||||
virHostdevReAttachSCSIHostdevs;
|
||||
virHostdevReAttachUSBHostdevs;
|
||||
virHostdevUpdateActivePCIHostdevs;
|
||||
virHostdevUpdateActiveSCSIHostdevs;
|
||||
virHostdevUpdateActiveUSBHostdevs;
|
||||
virHostdevReAttachSCSIDevices;
|
||||
virHostdevReAttachUSBDevices;
|
||||
virHostdevUpdateActivePCIDevices;
|
||||
virHostdevUpdateActiveSCSIDevices;
|
||||
virHostdevUpdateActiveUSBDevices;
|
||||
|
||||
# util/viridentity.h
|
||||
virIdentityGetAttr;
|
||||
|
@ -50,7 +50,7 @@ qemuUpdateActivePCIHostdevs(virQEMUDriverPtr driver,
|
||||
if (!def->nhostdevs)
|
||||
return 0;
|
||||
|
||||
return virHostdevUpdateActivePCIHostdevs(mgr, QEMU_DRIVER_NAME, def);
|
||||
return virHostdevUpdateActivePCIDevices(mgr, QEMU_DRIVER_NAME, def);
|
||||
}
|
||||
|
||||
int
|
||||
@ -62,7 +62,7 @@ qemuUpdateActiveUSBHostdevs(virQEMUDriverPtr driver,
|
||||
if (!def->nhostdevs)
|
||||
return 0;
|
||||
|
||||
return virHostdevUpdateActiveUSBHostdevs(mgr, QEMU_DRIVER_NAME, def);
|
||||
return virHostdevUpdateActiveUSBDevices(mgr, QEMU_DRIVER_NAME, def);
|
||||
}
|
||||
|
||||
int
|
||||
@ -74,7 +74,7 @@ qemuUpdateActiveSCSIHostdevs(virQEMUDriverPtr driver,
|
||||
if (!def->nhostdevs)
|
||||
return 0;
|
||||
|
||||
return virHostdevUpdateActiveSCSIHostdevs(mgr, QEMU_DRIVER_NAME, def);
|
||||
return virHostdevUpdateActiveSCSIDevices(mgr, QEMU_DRIVER_NAME, def);
|
||||
}
|
||||
|
||||
|
||||
@ -324,7 +324,7 @@ qemuDomainReAttachHostUSBDevices(virQEMUDriverPtr driver,
|
||||
{
|
||||
virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
|
||||
|
||||
virHostdevReAttachUSBHostdevs(hostdev_mgr, QEMU_DRIVER_NAME,
|
||||
virHostdevReAttachUSBDevices(hostdev_mgr, QEMU_DRIVER_NAME,
|
||||
name, hostdevs, nhostdevs);
|
||||
}
|
||||
|
||||
@ -347,7 +347,7 @@ qemuDomainReAttachHostSCSIDevices(virQEMUDriverPtr driver,
|
||||
ignore_value(qemuRemoveSharedDevice(driver, &dev, name));
|
||||
}
|
||||
|
||||
virHostdevReAttachSCSIHostdevs(hostdev_mgr, QEMU_DRIVER_NAME,
|
||||
virHostdevReAttachSCSIDevices(hostdev_mgr, QEMU_DRIVER_NAME,
|
||||
name, hostdevs, nhostdevs);
|
||||
}
|
||||
|
||||
|
@ -775,7 +775,7 @@ cleanup:
|
||||
}
|
||||
|
||||
int
|
||||
virHostdevUpdateActivePCIHostdevs(virHostdevManagerPtr mgr,
|
||||
virHostdevUpdateActivePCIDevices(virHostdevManagerPtr mgr,
|
||||
const char *drv_name,
|
||||
virDomainDefPtr def)
|
||||
{
|
||||
@ -834,7 +834,7 @@ cleanup:
|
||||
}
|
||||
|
||||
int
|
||||
virHostdevUpdateActiveUSBHostdevs(virHostdevManagerPtr mgr,
|
||||
virHostdevUpdateActiveUSBDevices(virHostdevManagerPtr mgr,
|
||||
const char *drv_name,
|
||||
virDomainDefPtr def)
|
||||
{
|
||||
@ -877,7 +877,7 @@ cleanup:
|
||||
}
|
||||
|
||||
int
|
||||
virHostdevUpdateActiveSCSIHostdevs(virHostdevManagerPtr mgr,
|
||||
virHostdevUpdateActiveSCSIDevices(virHostdevManagerPtr mgr,
|
||||
const char *drv_name,
|
||||
virDomainDefPtr def)
|
||||
{
|
||||
@ -926,7 +926,7 @@ cleanup:
|
||||
}
|
||||
|
||||
static int
|
||||
virHostdevMarkUSBHostdevs(virHostdevManagerPtr mgr,
|
||||
virHostdevMarkUSBDevices(virHostdevManagerPtr mgr,
|
||||
const char *drv_name,
|
||||
const char *dom_name,
|
||||
virUSBDeviceListPtr list)
|
||||
@ -1123,7 +1123,7 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr hostdev_mgr,
|
||||
* and add them do driver list. However, if something goes
|
||||
* wrong, perform rollback.
|
||||
*/
|
||||
if (virHostdevMarkUSBHostdevs(hostdev_mgr, drv_name, dom_name, list) < 0)
|
||||
if (virHostdevMarkUSBDevices(hostdev_mgr, drv_name, dom_name, list) < 0)
|
||||
goto cleanup;
|
||||
|
||||
/* Loop 2: Temporary list was successfully merged with
|
||||
@ -1254,7 +1254,7 @@ cleanup:
|
||||
}
|
||||
|
||||
void
|
||||
virHostdevReAttachUSBHostdevs(virHostdevManagerPtr hostdev_mgr,
|
||||
virHostdevReAttachUSBDevices(virHostdevManagerPtr hostdev_mgr,
|
||||
const char *drv_name,
|
||||
const char *dom_name,
|
||||
virDomainHostdevDefPtr *hostdevs,
|
||||
@ -1320,7 +1320,7 @@ virHostdevReAttachUSBHostdevs(virHostdevManagerPtr hostdev_mgr,
|
||||
}
|
||||
|
||||
void
|
||||
virHostdevReAttachSCSIHostdevs(virHostdevManagerPtr hostdev_mgr,
|
||||
virHostdevReAttachSCSIDevices(virHostdevManagerPtr hostdev_mgr,
|
||||
const char *drv_name,
|
||||
const char *dom_name,
|
||||
virDomainHostdevDefPtr *hostdevs,
|
||||
|
@ -79,27 +79,27 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr hostdev_mgr,
|
||||
int nhostdevs,
|
||||
const char *oldStateDir);
|
||||
void
|
||||
virHostdevReAttachUSBHostdevs(virHostdevManagerPtr hostdev_mgr,
|
||||
virHostdevReAttachUSBDevices(virHostdevManagerPtr hostdev_mgr,
|
||||
const char *drv_name,
|
||||
const char *dom_name,
|
||||
virDomainHostdevDefPtr *hostdevs,
|
||||
int nhostdevs);
|
||||
void
|
||||
virHostdevReAttachSCSIHostdevs(virHostdevManagerPtr hostdev_mgr,
|
||||
virHostdevReAttachSCSIDevices(virHostdevManagerPtr hostdev_mgr,
|
||||
const char *drv_name,
|
||||
const char *dom_name,
|
||||
virDomainHostdevDefPtr *hostdevs,
|
||||
int nhostdevs);
|
||||
int
|
||||
virHostdevUpdateActivePCIHostdevs(virHostdevManagerPtr mgr,
|
||||
virHostdevUpdateActivePCIDevices(virHostdevManagerPtr mgr,
|
||||
const char *drv_name,
|
||||
virDomainDefPtr def);
|
||||
int
|
||||
virHostdevUpdateActiveUSBHostdevs(virHostdevManagerPtr mgr,
|
||||
virHostdevUpdateActiveUSBDevices(virHostdevManagerPtr mgr,
|
||||
const char *drv_name,
|
||||
virDomainDefPtr def);
|
||||
int
|
||||
virHostdevUpdateActiveSCSIHostdevs(virHostdevManagerPtr mgr,
|
||||
virHostdevUpdateActiveSCSIDevices(virHostdevManagerPtr mgr,
|
||||
const char *drv_name,
|
||||
virDomainDefPtr def);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user