External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-09 09:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant duplicated 'Hostdev' string method names

Browse Source 
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:
Daniel P. Berrange 2014-03-12 16:35:30 +00:00
parent 7be4bddea1
commit e9a60dcc7c
4 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libvirt_private.syms
View File

@ -1306,11 +1306,11 @@ virHostdevPreparePCIDevices;
virHostdevPrepareSCSIDevices; virHostdevPrepareSCSIDevices;
virHostdevPrepareUSBDevices; virHostdevPrepareUSBDevices;
virHostdevReAttachPCIDevices; virHostdevReAttachPCIDevices;
virHostdevReAttachSCSIHostdevs; virHostdevReAttachSCSIDevices;
virHostdevReAttachUSBHostdevs; virHostdevReAttachUSBDevices;
virHostdevUpdateActivePCIHostdevs; virHostdevUpdateActivePCIDevices;
virHostdevUpdateActiveSCSIHostdevs; virHostdevUpdateActiveSCSIDevices;
virHostdevUpdateActiveUSBHostdevs; virHostdevUpdateActiveUSBDevices;
# util/viridentity.h # util/viridentity.h
virIdentityGetAttr; virIdentityGetAttr;

12
src/qemu/qemu_hostdev.c
View File

@ -50,7 +50,7 @@ qemuUpdateActivePCIHostdevs(virQEMUDriverPtr driver,
if (!def->nhostdevs) if (!def->nhostdevs)
return 0; return 0;
return virHostdevUpdateActivePCIHostdevs(mgr, QEMU_DRIVER_NAME, def); return virHostdevUpdateActivePCIDevices(mgr, QEMU_DRIVER_NAME, def);
} }
int int
@ -62,7 +62,7 @@ qemuUpdateActiveUSBHostdevs(virQEMUDriverPtr driver,
if (!def->nhostdevs) if (!def->nhostdevs)
return 0; return 0;
return virHostdevUpdateActiveUSBHostdevs(mgr, QEMU_DRIVER_NAME, def); return virHostdevUpdateActiveUSBDevices(mgr, QEMU_DRIVER_NAME, def);
} }
int int
@ -74,7 +74,7 @@ qemuUpdateActiveSCSIHostdevs(virQEMUDriverPtr driver,
if (!def->nhostdevs) if (!def->nhostdevs)
return 0; 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; virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
virHostdevReAttachUSBHostdevs(hostdev_mgr, QEMU_DRIVER_NAME, virHostdevReAttachUSBDevices(hostdev_mgr, QEMU_DRIVER_NAME,
name, hostdevs, nhostdevs); name, hostdevs, nhostdevs);
} }
@ -347,8 +347,8 @@ qemuDomainReAttachHostSCSIDevices(virQEMUDriverPtr driver,
ignore_value(qemuRemoveSharedDevice(driver, &dev, name)); ignore_value(qemuRemoveSharedDevice(driver, &dev, name));
} }
virHostdevReAttachSCSIHostdevs(hostdev_mgr, QEMU_DRIVER_NAME, virHostdevReAttachSCSIDevices(hostdev_mgr, QEMU_DRIVER_NAME,
name, hostdevs, nhostdevs); name, hostdevs, nhostdevs);
} }
void void

48
src/util/virhostdev.c
View File

@ -775,9 +775,9 @@ cleanup:
} }
int int
virHostdevUpdateActivePCIHostdevs(virHostdevManagerPtr mgr, virHostdevUpdateActivePCIDevices(virHostdevManagerPtr mgr,
const char *drv_name, const char *drv_name,
virDomainDefPtr def) virDomainDefPtr def)
{ {
virDomainHostdevDefPtr hostdev = NULL; virDomainHostdevDefPtr hostdev = NULL;
virPCIDevicePtr dev = NULL; virPCIDevicePtr dev = NULL;
@ -834,9 +834,9 @@ cleanup:
} }
int int
virHostdevUpdateActiveUSBHostdevs(virHostdevManagerPtr mgr, virHostdevUpdateActiveUSBDevices(virHostdevManagerPtr mgr,
const char *drv_name, const char *drv_name,
virDomainDefPtr def) virDomainDefPtr def)
{ {
virDomainHostdevDefPtr hostdev = NULL; virDomainHostdevDefPtr hostdev = NULL;
size_t i; size_t i;
@ -877,9 +877,9 @@ cleanup:
} }
int int
virHostdevUpdateActiveSCSIHostdevs(virHostdevManagerPtr mgr, virHostdevUpdateActiveSCSIDevices(virHostdevManagerPtr mgr,
const char *drv_name, const char *drv_name,
virDomainDefPtr def) virDomainDefPtr def)
{ {
virDomainHostdevDefPtr hostdev = NULL; virDomainHostdevDefPtr hostdev = NULL;
size_t i; size_t i;
@ -926,10 +926,10 @@ cleanup:
} }
static int static int
virHostdevMarkUSBHostdevs(virHostdevManagerPtr mgr, virHostdevMarkUSBDevices(virHostdevManagerPtr mgr,
const char *drv_name, const char *drv_name,
const char *dom_name, const char *dom_name,
virUSBDeviceListPtr list) virUSBDeviceListPtr list)
{ {
size_t i, j; size_t i, j;
unsigned int count; unsigned int count;
@ -1123,7 +1123,7 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr hostdev_mgr,
* and add them do driver list. However, if something goes * and add them do driver list. However, if something goes
* wrong, perform rollback. * 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; goto cleanup;
/* Loop 2: Temporary list was successfully merged with /* Loop 2: Temporary list was successfully merged with
@ -1254,11 +1254,11 @@ cleanup:
} }
void void
virHostdevReAttachUSBHostdevs(virHostdevManagerPtr hostdev_mgr, virHostdevReAttachUSBDevices(virHostdevManagerPtr hostdev_mgr,
const char *drv_name, const char *drv_name,
const char *dom_name, const char *dom_name,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
int nhostdevs) int nhostdevs)
{ {
size_t i; size_t i;
@ -1320,11 +1320,11 @@ virHostdevReAttachUSBHostdevs(virHostdevManagerPtr hostdev_mgr,
} }
void void
virHostdevReAttachSCSIHostdevs(virHostdevManagerPtr hostdev_mgr, virHostdevReAttachSCSIDevices(virHostdevManagerPtr hostdev_mgr,
const char *drv_name, const char *drv_name,
const char *dom_name, const char *dom_name,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
int nhostdevs) int nhostdevs)
{ {
size_t i; size_t i;

30
src/util/virhostdev.h
View File

@ -79,29 +79,29 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr hostdev_mgr,
int nhostdevs, int nhostdevs,
const char *oldStateDir); const char *oldStateDir);
void void
virHostdevReAttachUSBHostdevs(virHostdevManagerPtr hostdev_mgr, virHostdevReAttachUSBDevices(virHostdevManagerPtr hostdev_mgr,
const char *drv_name, const char *drv_name,
const char *dom_name, const char *dom_name,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
int nhostdevs); int nhostdevs);
void void
virHostdevReAttachSCSIHostdevs(virHostdevManagerPtr hostdev_mgr, virHostdevReAttachSCSIDevices(virHostdevManagerPtr hostdev_mgr,
const char *drv_name, const char *drv_name,
const char *dom_name, const char *dom_name,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
int nhostdevs); int nhostdevs);
int int
virHostdevUpdateActivePCIHostdevs(virHostdevManagerPtr mgr, virHostdevUpdateActivePCIDevices(virHostdevManagerPtr mgr,
const char *drv_name,
virDomainDefPtr def);
int
virHostdevUpdateActiveUSBDevices(virHostdevManagerPtr mgr,
const char *drv_name,
virDomainDefPtr def);
int
virHostdevUpdateActiveSCSIDevices(virHostdevManagerPtr mgr,
const char *drv_name, const char *drv_name,
virDomainDefPtr def); virDomainDefPtr def);
int
virHostdevUpdateActiveUSBHostdevs(virHostdevManagerPtr mgr,
const char *drv_name,
virDomainDefPtr def);
int
virHostdevUpdateActiveSCSIHostdevs(virHostdevManagerPtr mgr,
const char *drv_name,
virDomainDefPtr def);
/* functions used by NodeDevDetach/Reattach/Reset */ /* functions used by NodeDevDetach/Reattach/Reset */
int virHostdevPCINodeDeviceDetach(virHostdevManagerPtr mgr, int virHostdevPCINodeDeviceDetach(virHostdevManagerPtr mgr,