External/libvirt
1
0
Fork 0
Code

nodedev: factor out nodeDeviceHasCapability()

Browse Source 
Currently nodeDeviceCreateXML() and nodeDeviceDestroy() only support
NPIV HBAs, but we want to be able to create mdev devices as well. This
is a first step to enabling that support.

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:55 -05:00 committed by Erik Skultety
parent 9baffe90b5
commit 37ab63a6fc
1 changed files with 60 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/node_device/node_device_driver.c
View File

@ -488,6 +488,21 @@ nodeDeviceFindNewDevice(virConnectPtr conn,
} }
static bool
nodeDeviceHasCapability(virNodeDeviceDefPtr def, virNodeDevCapType type)
{
virNodeDevCapsDefPtr cap = def->caps;
while (cap != NULL) {
if (cap->data.type == type)
return true;
cap = cap->next;
}
return false;
}
virNodeDevicePtr virNodeDevicePtr
nodeDeviceCreateXML(virConnectPtr conn, nodeDeviceCreateXML(virConnectPtr conn,
const char *xmlDesc, const char *xmlDesc,
@ -513,24 +528,29 @@ nodeDeviceCreateXML(virConnectPtr conn,
if (virNodeDeviceCreateXMLEnsureACL(conn, def) < 0) if (virNodeDeviceCreateXMLEnsureACL(conn, def) < 0)
return NULL; return NULL;
if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) == -1) if (nodeDeviceHasCapability(def, VIR_NODE_DEV_CAP_SCSI_HOST)) {
return NULL; if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) == -1)
return NULL;
if ((parent_host = virNodeDeviceObjListGetParentHost(driver->devs, def)) < 0) if ((parent_host = virNodeDeviceObjListGetParentHost(driver->devs, def)) < 0)
return NULL; return NULL;
if (virVHBAManageVport(parent_host, wwpn, wwnn, VPORT_CREATE) < 0) if (virVHBAManageVport(parent_host, wwpn, wwnn, VPORT_CREATE) < 0)
return NULL; return NULL;
device = nodeDeviceFindNewDevice(conn, wwnn, wwpn); device = nodeDeviceFindNewDevice(conn, wwnn, wwpn);
/* We don't check the return value, because one way or another, /* We don't check the return value, because one way or another,
* we're returning what we get... */ * we're returning what we get... */
if (device == NULL) if (device == NULL)
virReportError(VIR_ERR_NO_NODE_DEVICE, virReportError(VIR_ERR_NO_NODE_DEVICE,
_("no node device for '%s' with matching " _("no node device for '%s' with matching "
"wwnn '%s' and wwpn '%s'"), "wwnn '%s' and wwpn '%s'"),
def->name, wwnn, wwpn); def->name, wwnn, wwpn);
} else {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Unsupported device type"));
}
return device; return device;
} }
@ -557,32 +577,37 @@ nodeDeviceDestroy(virNodeDevicePtr device)
if (virNodeDeviceDestroyEnsureACL(device->conn, def) < 0) if (virNodeDeviceDestroyEnsureACL(device->conn, def) < 0)
goto cleanup; goto cleanup;
if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) < 0) if (nodeDeviceHasCapability(def, VIR_NODE_DEV_CAP_SCSI_HOST)) {
goto cleanup; if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) < 0)
goto cleanup;
/* Because we're about to release the lock and thus run into a race /* Because we're about to release the lock and thus run into a race
* possibility (however improbable) with a udevAddOneDevice change * possibility (however improbable) with a udevAddOneDevice change
* event which would essentially free the existing @def (obj->def) and * event which would essentially free the existing @def (obj->def) and
* replace it with something new, we need to grab the parent field * replace it with something new, we need to grab the parent field
* and then find the parent obj in order to manage the vport */ * and then find the parent obj in order to manage the vport */
parent = g_strdup(def->parent); parent = g_strdup(def->parent);
virNodeDeviceObjEndAPI(&obj); virNodeDeviceObjEndAPI(&obj);
if (!(obj = virNodeDeviceObjListFindByName(driver->devs, parent))) { if (!(obj = virNodeDeviceObjListFindByName(driver->devs, parent))) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot find parent '%s' definition"), parent); _("cannot find parent '%s' definition"), parent);
goto cleanup; goto cleanup;
}
if (virSCSIHostGetNumber(parent, &parent_host) < 0)
goto cleanup;
if (virVHBAManageVport(parent_host, wwpn, wwnn, VPORT_DELETE) < 0)
goto cleanup;
ret = 0;
} else {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Unsupported device type"));
} }
if (virSCSIHostGetNumber(parent, &parent_host) < 0)
goto cleanup;
if (virVHBAManageVport(parent_host, wwpn, wwnn, VPORT_DELETE) < 0)
goto cleanup;
ret = 0;
cleanup: cleanup:
virNodeDeviceObjEndAPI(&obj); virNodeDeviceObjEndAPI(&obj);
return ret; return ret;