External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-04-26 15:14:42 +00:00
Code

nodedev: Rename nodeDeviceWaitInit()

Browse Source 
The consensus is to put the verb last. Therefore, the new name is
nodeDeviceInitWait(). This allows us to introduce new function
(done later in a separate commit) that will "complete" the device
initialization.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Michal Privoznik 2021-04-13 11:14:15 +02:00
parent c8238579fb
commit 72e3fc595e
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/node_device/node_device_driver.c
View File

@ -158,7 +158,7 @@ nodeDeviceUnlock(void)
static int static int
nodeDeviceWaitInit(void) nodeDeviceInitWait(void)
{ {
nodeDeviceLock(); nodeDeviceLock();
while (!driver->initialized) { while (!driver->initialized) {
@ -183,7 +183,7 @@ nodeNumOfDevices(virConnectPtr conn,
virCheckFlags(0, -1); virCheckFlags(0, -1);
if (nodeDeviceWaitInit() < 0) if (nodeDeviceInitWait() < 0)
return -1; return -1;
return virNodeDeviceObjListNumOfDevices(driver->devs, conn, cap, return virNodeDeviceObjListNumOfDevices(driver->devs, conn, cap,
@ -203,7 +203,7 @@ nodeListDevices(virConnectPtr conn,
virCheckFlags(0, -1); virCheckFlags(0, -1);
if (nodeDeviceWaitInit() < 0) if (nodeDeviceInitWait() < 0)
return -1; return -1;
return virNodeDeviceObjListGetNames(driver->devs, conn, return virNodeDeviceObjListGetNames(driver->devs, conn,
@ -222,7 +222,7 @@ nodeConnectListAllNodeDevices(virConnectPtr conn,
if (virConnectListAllNodeDevicesEnsureACL(conn) < 0) if (virConnectListAllNodeDevicesEnsureACL(conn) < 0)
return -1; return -1;
if (nodeDeviceWaitInit() < 0) if (nodeDeviceInitWait() < 0)
return -1; return -1;
return virNodeDeviceObjListExport(conn, driver->devs, devices, return virNodeDeviceObjListExport(conn, driver->devs, devices,
@ -254,7 +254,7 @@ nodeDeviceLookupByName(virConnectPtr conn,
virNodeDeviceDef *def; virNodeDeviceDef *def;
virNodeDevicePtr device = NULL; virNodeDevicePtr device = NULL;
if (nodeDeviceWaitInit() < 0) if (nodeDeviceInitWait() < 0)
return NULL; return NULL;
if (!(obj = nodeDeviceObjFindByName(name))) if (!(obj = nodeDeviceObjFindByName(name)))
@ -285,7 +285,7 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn,
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
if (nodeDeviceWaitInit() < 0) if (nodeDeviceInitWait() < 0)
return NULL; return NULL;
if (!(obj = virNodeDeviceObjListFindSCSIHostByWWNs(driver->devs, if (!(obj = virNodeDeviceObjListFindSCSIHostByWWNs(driver->devs,
@ -844,7 +844,7 @@ nodeDeviceCreateXML(virConnectPtr conn,
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
if (nodeDeviceWaitInit() < 0) if (nodeDeviceInitWait() < 0)
return NULL; return NULL;
virt_type = virConnectGetType(conn); virt_type = virConnectGetType(conn);
@ -1144,7 +1144,7 @@ nodeDeviceDestroy(virNodeDevicePtr device)
g_autofree char *wwpn = NULL; g_autofree char *wwpn = NULL;
unsigned int parent_host; unsigned int parent_host;
if (nodeDeviceWaitInit() < 0) if (nodeDeviceInitWait() < 0)
return -1; return -1;
if (!(obj = nodeDeviceObjFindByName(device->name))) if (!(obj = nodeDeviceObjFindByName(device->name)))
@ -1288,7 +1288,7 @@ nodeDeviceDefineXML(virConnect *conn,
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
if (nodeDeviceWaitInit() < 0) if (nodeDeviceInitWait() < 0)
return NULL; return NULL;
virt_type = virConnectGetType(conn); virt_type = virConnectGetType(conn);
@ -1350,7 +1350,7 @@ nodeDeviceUndefine(virNodeDevice *device,
virCheckFlags(0, -1); virCheckFlags(0, -1);
if (nodeDeviceWaitInit() < 0) if (nodeDeviceInitWait() < 0)
return -1; return -1;
if (!(obj = nodeDeviceObjFindByName(device->name))) if (!(obj = nodeDeviceObjFindByName(device->name)))
@ -1446,7 +1446,7 @@ nodeConnectNodeDeviceEventRegisterAny(virConnectPtr conn,
if (virConnectNodeDeviceEventRegisterAnyEnsureACL(conn) < 0) if (virConnectNodeDeviceEventRegisterAnyEnsureACL(conn) < 0)
return -1; return -1;
if (nodeDeviceWaitInit() < 0) if (nodeDeviceInitWait() < 0)
return -1; return -1;
if (virNodeDeviceEventStateRegisterID(conn, driver->nodeDeviceEventState, if (virNodeDeviceEventStateRegisterID(conn, driver->nodeDeviceEventState,
@ -1465,7 +1465,7 @@ nodeConnectNodeDeviceEventDeregisterAny(virConnectPtr conn,
if (virConnectNodeDeviceEventDeregisterAnyEnsureACL(conn) < 0) if (virConnectNodeDeviceEventDeregisterAnyEnsureACL(conn) < 0)
return -1; return -1;
if (nodeDeviceWaitInit() < 0) if (nodeDeviceInitWait() < 0)
return -1; return -1;
if (virObjectEventStateDeregisterID(conn, if (virObjectEventStateDeregisterID(conn,