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

nodedev: refactor nodeDeviceFindNewDevice()

Browse Source 
In preparation for creating mediated devices in libvirt, we will need to
wait for new mediated devices to be created as well. Refactor
nodeDeviceFindNewDevice() so that we can re-use the main logic from this
function to wait for different device types by passing a different
'find' function.

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Jonathon Jongsma 2020-06-18 16:05:57 -05:00 committed by Erik Skultety
parent c952d9cc1e
commit 81dc248ea4
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/node_device/node_device_driver.c
View File

@ -447,6 +447,10 @@ nodeDeviceGetTime(time_t *t)
}
typedef virNodeDevicePtr (*nodeDeviceFindNewDeviceFunc)(virConnectPtr conn,
const void* opaque);
/* When large numbers of devices are present on the host, it's
* possible for udev not to realize that it has work to do before we
* get here. We thus keep trying to find the new device we just
@ -462,8 +466,8 @@ nodeDeviceGetTime(time_t *t)
*/
static virNodeDevicePtr
nodeDeviceFindNewDevice(virConnectPtr conn,
const char *wwnn,
const char *wwpn)
nodeDeviceFindNewDeviceFunc func,
const void *opaque)
{
virNodeDevicePtr device = NULL;
time_t start = 0, now = 0;
@ -474,7 +478,7 @@ nodeDeviceFindNewDevice(virConnectPtr conn,
virWaitForDevices();
device = nodeDeviceLookupSCSIHostByWWN(conn, wwnn, wwpn, 0);
device = func(conn, opaque);
if (device != NULL)
break;
@ -488,6 +492,35 @@ nodeDeviceFindNewDevice(virConnectPtr conn,
}
typedef struct _NewSCSIHostFuncData NewSCSIHostFuncData;
struct _NewSCSIHostFuncData
{
const char *wwnn;
const char *wwpn;
};
static virNodeDevicePtr
nodeDeviceFindNewSCSIHostFunc(virConnectPtr conn,
const void *opaque)
{
const NewSCSIHostFuncData *data = opaque;
return nodeDeviceLookupSCSIHostByWWN(conn, data->wwnn, data->wwpn, 0);
}
static virNodeDevicePtr
nodeDeviceFindNewSCSIHost(virConnectPtr conn,
const char *wwnn,
const char *wwpn)
{
NewSCSIHostFuncData data = { .wwnn = wwnn, .wwpn = wwpn};
return nodeDeviceFindNewDevice(conn, nodeDeviceFindNewSCSIHostFunc, &data);
}
static bool
nodeDeviceHasCapability(virNodeDeviceDefPtr def, virNodeDevCapType type)
{
@ -538,7 +571,7 @@ nodeDeviceCreateXML(virConnectPtr conn,
if (virVHBAManageVport(parent_host, wwpn, wwnn, VPORT_CREATE) < 0)
return NULL;
device = nodeDeviceFindNewDevice(conn, wwnn, wwpn);
device = nodeDeviceFindNewSCSIHost(conn, wwnn, wwpn);
/* We don't check the return value, because one way or another,
* we're returning what we get... */