shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 01:34:11 +03:00
Code Releases Activity

nodedev: Use consistent names for driver variables

Browse Source 
A virNodeDeviceObjPtr is an @obj

A virNodeDeviceObjListPtr is a @devs

A virNodeDevicePtr is a @device

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-05-12 12:45:16 -04:00
parent 1429542725
commit aa6e856b95
3 changed files with 76 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/node_device/node_device_driver.c
View File

@ -260,7 +260,7 @@ nodeDeviceLookupByName(virConnectPtr conn,
{
virNodeDeviceObjPtr obj;
virNodeDeviceDefPtr def;
virNodeDevicePtr ret = NULL;
virNodeDevicePtr device = NULL;
if (!(obj = nodeDeviceObjFindByName(name)))
return NULL;
@ -269,16 +269,16 @@ nodeDeviceLookupByName(virConnectPtr conn,
if (virNodeDeviceLookupByNameEnsureACL(conn, def) < 0)
goto cleanup;
if ((ret = virGetNodeDevice(conn, name))) {
if (VIR_STRDUP(ret->parent, def->parent) < 0) {
virObjectUnref(ret);
ret = NULL;
if ((device = virGetNodeDevice(conn, name))) {
if (VIR_STRDUP(device->parent, def->parent) < 0) {
virObjectUnref(device);
device = NULL;
}
}
cleanup:
virNodeDeviceObjUnlock(obj);
return ret;
return device;
}
@ -293,7 +293,7 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn,
virNodeDevCapsDefPtr cap = NULL;
virNodeDeviceObjPtr obj = NULL;
virNodeDeviceDefPtr def;
virNodeDevicePtr dev = NULL;
virNodeDevicePtr device = NULL;
virCheckFlags(0, NULL);
@ -316,10 +316,10 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn,
if (virNodeDeviceLookupSCSIHostByWWNEnsureACL(conn, def) < 0)
goto error;
if ((dev = virGetNodeDevice(conn, def->name))) {
if (VIR_STRDUP(dev->parent, def->parent) < 0) {
virObjectUnref(dev);
dev = NULL;
if ((device = virGetNodeDevice(conn, def->name))) {
if (VIR_STRDUP(device->parent, def->parent) < 0) {
virObjectUnref(device);
device = NULL;
}
}
virNodeDeviceObjUnlock(obj);
@ -335,7 +335,7 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn,
out:
nodeDeviceUnlock();
return dev;
return device;
error:
virNodeDeviceObjUnlock(obj);
@ -344,7 +344,7 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn,
char *
nodeDeviceGetXMLDesc(virNodeDevicePtr dev,
nodeDeviceGetXMLDesc(virNodeDevicePtr device,
unsigned int flags)
{
virNodeDeviceObjPtr obj;
@ -353,11 +353,11 @@ nodeDeviceGetXMLDesc(virNodeDevicePtr dev,
virCheckFlags(0, NULL);
if (!(obj = nodeDeviceObjFindByName(dev->name)))
if (!(obj = nodeDeviceObjFindByName(device->name)))
return NULL;
def = virNodeDeviceObjGetDef(obj);
if (virNodeDeviceGetXMLDescEnsureACL(dev->conn, def) < 0)
if (virNodeDeviceGetXMLDescEnsureACL(device->conn, def) < 0)
goto cleanup;
if (nodeDeviceUpdateDriverName(def) < 0)
@ -375,17 +375,17 @@ nodeDeviceGetXMLDesc(virNodeDevicePtr dev,
char *
nodeDeviceGetParent(virNodeDevicePtr dev)
nodeDeviceGetParent(virNodeDevicePtr device)
{
virNodeDeviceObjPtr obj;
virNodeDeviceDefPtr def;
char *ret = NULL;
if (!(obj = nodeDeviceObjFindByName(dev->name)))
if (!(obj = nodeDeviceObjFindByName(device->name)))
return NULL;
def = virNodeDeviceObjGetDef(obj);
if (virNodeDeviceGetParentEnsureACL(dev->conn, def) < 0)
if (virNodeDeviceGetParentEnsureACL(device->conn, def) < 0)
goto cleanup;
if (def->parent) {
@ -403,7 +403,7 @@ nodeDeviceGetParent(virNodeDevicePtr dev)
int
nodeDeviceNumOfCaps(virNodeDevicePtr dev)
nodeDeviceNumOfCaps(virNodeDevicePtr device)
{
virNodeDeviceObjPtr obj;
virNodeDeviceDefPtr def;
@ -411,11 +411,11 @@ nodeDeviceNumOfCaps(virNodeDevicePtr dev)
int ncaps = 0;
int ret = -1;
if (!(obj = nodeDeviceObjFindByName(dev->name)))
if (!(obj = nodeDeviceObjFindByName(device->name)))
return -1;
def = virNodeDeviceObjGetDef(obj);
if (virNodeDeviceNumOfCapsEnsureACL(dev->conn, def) < 0)
if (virNodeDeviceNumOfCapsEnsureACL(device->conn, def) < 0)
goto cleanup;
for (caps = def->caps; caps; caps = caps->next) {
@ -442,7 +442,7 @@ nodeDeviceNumOfCaps(virNodeDevicePtr dev)
int
nodeDeviceListCaps(virNodeDevicePtr dev,
nodeDeviceListCaps(virNodeDevicePtr device,
char **const names,
int maxnames)
{
@ -452,11 +452,11 @@ nodeDeviceListCaps(virNodeDevicePtr dev,
int ncaps = 0;
int ret = -1;
if (!(obj = nodeDeviceObjFindByName(dev->name)))
if (!(obj = nodeDeviceObjFindByName(device->name)))
return -1;
def = virNodeDeviceObjGetDef(obj);
if (virNodeDeviceListCapsEnsureACL(dev->conn, def) < 0)
if (virNodeDeviceListCapsEnsureACL(device->conn, def) < 0)
goto cleanup;
for (caps = def->caps; caps && ncaps < maxnames; caps = caps->next) {
@ -530,7 +530,7 @@ nodeDeviceFindNewDevice(virConnectPtr conn,
const char *wwnn,
const char *wwpn)
{
virNodeDevicePtr dev = NULL;
virNodeDevicePtr device = NULL;
time_t start = 0, now = 0;
/* The thread that creates the device takes the driver lock, so we
@ -546,9 +546,9 @@ nodeDeviceFindNewDevice(virConnectPtr conn,
virWaitForDevices();
dev = nodeDeviceLookupSCSIHostByWWN(conn, wwnn, wwpn, 0);
device = nodeDeviceLookupSCSIHostByWWN(conn, wwnn, wwpn, 0);
if (dev != NULL)
if (device != NULL)
break;
sleep(5);
@ -558,7 +558,7 @@ nodeDeviceFindNewDevice(virConnectPtr conn,
nodeDeviceLock();
return dev;
return device;
}
@ -570,7 +570,7 @@ nodeDeviceCreateXML(virConnectPtr conn,
virNodeDeviceDefPtr def = NULL;
char *wwnn = NULL, *wwpn = NULL;
int parent_host = -1;
virNodeDevicePtr dev = NULL;
virNodeDevicePtr device = NULL;
const char *virt_type = NULL;
virCheckFlags(0, NULL);
@ -594,11 +594,11 @@ nodeDeviceCreateXML(virConnectPtr conn,
if (virVHBAManageVport(parent_host, wwpn, wwnn, VPORT_CREATE) < 0)
goto cleanup;
dev = nodeDeviceFindNewDevice(conn, wwnn, wwpn);
device = nodeDeviceFindNewDevice(conn, wwnn, wwpn);
/* We don't check the return value, because one way or another,
* we're returning what we get... */
if (dev == NULL)
if (device == NULL)
virReportError(VIR_ERR_NO_NODE_DEVICE,
_("no node device for '%s' with matching "
"wwnn '%s' and wwpn '%s'"),
@ -608,12 +608,12 @@ nodeDeviceCreateXML(virConnectPtr conn,
virNodeDeviceDefFree(def);
VIR_FREE(wwnn);
VIR_FREE(wwpn);
return dev;
return device;
}
int
nodeDeviceDestroy(virNodeDevicePtr dev)
nodeDeviceDestroy(virNodeDevicePtr device)
{
int ret = -1;
virNodeDeviceObjPtr obj = NULL;
@ -621,13 +621,13 @@ nodeDeviceDestroy(virNodeDevicePtr dev)
char *wwnn = NULL, *wwpn = NULL;
int parent_host = -1;
if (!(obj = nodeDeviceObjFindByName(dev->name)))
if (!(obj = nodeDeviceObjFindByName(device->name)))
return -1;
def = virNodeDeviceObjGetDef(obj);
nodeDeviceLock();
if (virNodeDeviceDestroyEnsureACL(dev->conn, def) < 0)
if (virNodeDeviceDestroyEnsureACL(device->conn, def) < 0)
goto cleanup;
if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) < 0)
@ -660,7 +660,7 @@ nodeDeviceDestroy(virNodeDevicePtr dev)
int
nodeConnectNodeDeviceEventRegisterAny(virConnectPtr conn,
virNodeDevicePtr dev,
virNodeDevicePtr device,
int eventID,
virConnectNodeDeviceEventGenericCallback callback,
void *opaque,
@ -672,7 +672,7 @@ nodeConnectNodeDeviceEventRegisterAny(virConnectPtr conn,
goto cleanup;
if (virNodeDeviceEventStateRegisterID(conn, driver->nodeDeviceEventState,
dev, eventID, callback,
device, eventID, callback,
opaque, freecb, &callbackID) < 0)
callbackID = -1;
cleanup:

39
src/node_device/node_device_hal.c
View File

@ -449,7 +449,7 @@ dev_create(const char *udi)
{
LibHalContext *ctx;
char *parent_key = NULL;
virNodeDeviceObjPtr dev = NULL;
virNodeDeviceObjPtr obj = NULL;
virNodeDeviceDefPtr def = NULL;
virNodeDeviceDefPtr objdef;
const char *name = hal_name(udi);
@ -482,15 +482,15 @@ dev_create(const char *udi)
/* Some devices don't have a path in sysfs, so ignore failure */
(void)get_str_prop(ctx, udi, "linux.sysfs_path", &devicePath);
if (!(dev = virNodeDeviceObjAssignDef(&driver->devs, def))) {
if (!(obj = virNodeDeviceObjAssignDef(&driver->devs, def))) {
VIR_FREE(devicePath);
goto failure;
}
objdef = virNodeDeviceObjGetDef(dev);
objdef = virNodeDeviceObjGetDef(obj);
objdef->sysfs_path = devicePath;
virNodeDeviceObjUnlock(dev);
virNodeDeviceObjUnlock(obj);
nodeDeviceUnlock();
return;
@ -506,22 +506,21 @@ static void
dev_refresh(const char *udi)
{
const char *name = hal_name(udi);
virNodeDeviceObjPtr dev;
virNodeDeviceObjPtr obj;
nodeDeviceLock();
dev = virNodeDeviceObjFindByName(&driver->devs, name);
if (dev) {
if ((obj = virNodeDeviceObjFindByName(&driver->devs, name))) {
/* Simply "rediscover" device -- incrementally handling changes
* to sub-capabilities (like net.80203) is nasty ... so avoid it.
*/
virNodeDeviceObjRemove(&driver->devs, dev);
virNodeDeviceObjRemove(&driver->devs, obj);
} else {
VIR_DEBUG("no device named %s", name);
}
nodeDeviceUnlock();
if (dev) {
virNodeDeviceObjFree(dev);
if (obj) {
virNodeDeviceObjFree(obj);
dev_create(udi);
}
}
@ -540,17 +539,17 @@ device_removed(LibHalContext *ctx ATTRIBUTE_UNUSED,
const char *udi)
{
const char *name = hal_name(udi);
virNodeDeviceObjPtr dev;
virNodeDeviceObjPtr obj;
nodeDeviceLock();
dev = virNodeDeviceObjFindByName(&driver->devs, name);
obj = virNodeDeviceObjFindByName(&driver->devs, name);
VIR_DEBUG("%s", name);
if (dev)
virNodeDeviceObjRemove(&driver->devs, dev);
if (obj)
virNodeDeviceObjRemove(&driver->devs, obj);
else
VIR_DEBUG("no device named %s", name);
nodeDeviceUnlock();
virNodeDeviceObjFree(dev);
virNodeDeviceObjFree(obj);
}
@ -559,17 +558,17 @@ device_cap_added(LibHalContext *ctx,
const char *udi, const char *cap)
{
const char *name = hal_name(udi);
virNodeDeviceObjPtr dev;
virNodeDeviceObjPtr obj;
virNodeDeviceDefPtr def;
nodeDeviceLock();
dev = virNodeDeviceObjFindByName(&driver->devs, name);
obj = virNodeDeviceObjFindByName(&driver->devs, name);
nodeDeviceUnlock();
VIR_DEBUG("%s %s", cap, name);
if (dev) {
def = virNodeDeviceObjGetDef(dev);
if (obj) {
def = virNodeDeviceObjGetDef(obj);
(void)gather_capability(ctx, udi, cap, &def->caps);
virNodeDeviceObjUnlock(dev);
virNodeDeviceObjUnlock(obj);
} else {
VIR_DEBUG("no device named %s", name);
}

46
src/node_device/node_device_udev.c
View File

@ -1312,20 +1312,18 @@ udevGetDeviceDetails(struct udev_device *device,
static int
udevRemoveOneDevice(struct udev_device *device)
{
virNodeDeviceObjPtr dev = NULL;
virNodeDeviceObjPtr obj = NULL;
virNodeDeviceDefPtr def;
virObjectEventPtr event = NULL;
const char *name = NULL;
name = udev_device_get_syspath(device);
dev = virNodeDeviceObjFindBySysfsPath(&driver->devs, name);
if (!dev) {
if (!(obj = virNodeDeviceObjFindBySysfsPath(&driver->devs, name))) {
VIR_DEBUG("Failed to find device to remove that has udev name '%s'",
name);
return -1;
}
def = virNodeDeviceObjGetDef(dev);
def = virNodeDeviceObjGetDef(obj);
event = virNodeDeviceEventLifecycleNew(def->name,
VIR_NODE_DEVICE_EVENT_DELETED,
@ -1333,8 +1331,8 @@ udevRemoveOneDevice(struct udev_device *device)
VIR_DEBUG("Removing device '%s' with sysfs path '%s'",
def->name, name);
virNodeDeviceObjRemove(&driver->devs, dev);
virNodeDeviceObjFree(dev);
virNodeDeviceObjRemove(&driver->devs, obj);
virNodeDeviceObjFree(obj);
if (event)
virObjectEventStateQueue(driver->nodeDeviceEventState, event);
@ -1348,7 +1346,7 @@ udevSetParent(struct udev_device *device,
{
struct udev_device *parent_device = NULL;
const char *parent_sysfs_path = NULL;
virNodeDeviceObjPtr dev = NULL;
virNodeDeviceObjPtr obj = NULL;
virNodeDeviceDefPtr objdef;
int ret = -1;
@ -1367,15 +1365,14 @@ udevSetParent(struct udev_device *device,
goto cleanup;
}
dev = virNodeDeviceObjFindBySysfsPath(&driver->devs,
parent_sysfs_path);
if (dev != NULL) {
objdef = virNodeDeviceObjGetDef(dev);
if ((obj = virNodeDeviceObjFindBySysfsPath(&driver->devs,
parent_sysfs_path))) {
objdef = virNodeDeviceObjGetDef(obj);
if (VIR_STRDUP(def->parent, objdef->name) < 0) {
virNodeDeviceObjUnlock(dev);
virNodeDeviceObjUnlock(obj);
goto cleanup;
}
virNodeDeviceObjUnlock(dev);
virNodeDeviceObjUnlock(obj);
if (VIR_STRDUP(def->parent_sysfs_path, parent_sysfs_path) < 0)
goto cleanup;
@ -1397,7 +1394,7 @@ static int
udevAddOneDevice(struct udev_device *device)
{
virNodeDeviceDefPtr def = NULL;
virNodeDeviceObjPtr dev = NULL;
virNodeDeviceObjPtr obj = NULL;
virNodeDeviceDefPtr objdef;
virObjectEventPtr event = NULL;
bool new_device = true;
@ -1427,18 +1424,16 @@ udevAddOneDevice(struct udev_device *device)
if (udevSetParent(device, def) != 0)
goto cleanup;
dev = virNodeDeviceObjFindByName(&driver->devs, def->name);
if (dev) {
virNodeDeviceObjUnlock(dev);
if ((obj = virNodeDeviceObjFindByName(&driver->devs, def->name))) {
virNodeDeviceObjUnlock(obj);
new_device = false;
}
/* If this is a device change, the old definition will be freed
* and the current definition will take its place. */
dev = virNodeDeviceObjAssignDef(&driver->devs, def);
if (dev == NULL)
if (!(obj = virNodeDeviceObjAssignDef(&driver->devs, def)))
goto cleanup;
objdef = virNodeDeviceObjGetDef(dev);
objdef = virNodeDeviceObjGetDef(obj);
if (new_device)
event = virNodeDeviceEventLifecycleNew(objdef->name,
@ -1447,7 +1442,7 @@ udevAddOneDevice(struct udev_device *device)
else
event = virNodeDeviceEventUpdateNew(objdef->name);
virNodeDeviceObjUnlock(dev);
virNodeDeviceObjUnlock(obj);
ret = 0;
@ -1710,7 +1705,7 @@ static int
udevSetupSystemDev(void)
{
virNodeDeviceDefPtr def = NULL;
virNodeDeviceObjPtr dev = NULL;
virNodeDeviceObjPtr obj = NULL;
int ret = -1;
if (VIR_ALLOC(def) < 0)
@ -1726,11 +1721,10 @@ udevSetupSystemDev(void)
udevGetDMIData(&def->caps->data.system);
#endif
dev = virNodeDeviceObjAssignDef(&driver->devs, def);
if (dev == NULL)
if (!(obj = virNodeDeviceObjAssignDef(&driver->devs, def)))
goto cleanup;
virNodeDeviceObjUnlock(dev);
virNodeDeviceObjUnlock(obj);
ret = 0;