From nobody Mon Dec 15 03:23:04 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1496495533600577.1644108160863; Sat, 3 Jun 2017 06:12:13 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 097F0232040; Sat, 3 Jun 2017 13:12:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CE7F382489; Sat, 3 Jun 2017 13:12:10 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2E55B4BB7F; Sat, 3 Jun 2017 13:12:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v53DC7U3005751 for ; Sat, 3 Jun 2017 09:12:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id B31B7179C2; Sat, 3 Jun 2017 13:12:07 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-124.phx2.redhat.com [10.3.116.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6027E7B8FE for ; Sat, 3 Jun 2017 13:12:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 097F0232040 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 097F0232040 From: John Ferlan To: libvir-list@redhat.com Date: Sat, 3 Jun 2017 09:11:54 -0400 Message-Id: <20170603131202.17611-5-jferlan@redhat.com> In-Reply-To: <20170603131202.17611-1-jferlan@redhat.com> References: <20170603131202.17611-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 04/12] nodedev: Use consistent names for driver variables X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Sat, 03 Jun 2017 13:12:11 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" A virNodeDeviceObjPtr is an @obj A virNodeDeviceObjListPtr is a @devs A virNodeDevicePtr is a @device Signed-off-by: John Ferlan --- src/node_device/node_device_driver.c | 74 ++++++++++++++++++--------------= ---- src/node_device/node_device_hal.c | 38 +++++++++--------- src/node_device/node_device_udev.c | 48 +++++++++++------------ 3 files changed, 78 insertions(+), 82 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index 760d73a..8153e21 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -260,7 +260,7 @@ nodeDeviceLookupByName(virConnectPtr conn, { virNodeDeviceObjPtr obj; virNodeDeviceDefPtr def; - virNodeDevicePtr ret =3D NULL; + virNodeDevicePtr device =3D NULL; =20 if (!(obj =3D nodeDeviceObjFindByName(name))) return NULL; @@ -269,16 +269,16 @@ nodeDeviceLookupByName(virConnectPtr conn, if (virNodeDeviceLookupByNameEnsureACL(conn, def) < 0) goto cleanup; =20 - if ((ret =3D virGetNodeDevice(conn, name))) { - if (VIR_STRDUP(ret->parent, def->parent) < 0) { - virObjectUnref(ret); - ret =3D NULL; + if ((device =3D virGetNodeDevice(conn, name))) { + if (VIR_STRDUP(device->parent, def->parent) < 0) { + virObjectUnref(device); + device =3D NULL; } } =20 cleanup: virNodeDeviceObjUnlock(obj); - return ret; + return device; } =20 =20 @@ -293,7 +293,7 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, virNodeDevCapsDefPtr cap =3D NULL; virNodeDeviceObjPtr obj =3D NULL; virNodeDeviceDefPtr def; - virNodeDevicePtr dev =3D NULL; + virNodeDevicePtr device =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -316,10 +316,10 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, if (virNodeDeviceLookupSCSIHostByWWNEnsureACL(conn= , def) < 0) goto error; =20 - if ((dev =3D virGetNodeDevice(conn, def->name))) { - if (VIR_STRDUP(dev->parent, def->parent) < 0) { - virObjectUnref(dev); - dev =3D NULL; + if ((device =3D virGetNodeDevice(conn, def->name))= ) { + if (VIR_STRDUP(device->parent, def->parent) < = 0) { + virObjectUnref(device); + device =3D NULL; } } virNodeDeviceObjUnlock(obj); @@ -335,7 +335,7 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, =20 out: nodeDeviceUnlock(); - return dev; + return device; =20 error: virNodeDeviceObjUnlock(obj); @@ -344,7 +344,7 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, =20 =20 char * -nodeDeviceGetXMLDesc(virNodeDevicePtr dev, +nodeDeviceGetXMLDesc(virNodeDevicePtr device, unsigned int flags) { virNodeDeviceObjPtr obj; @@ -353,11 +353,11 @@ nodeDeviceGetXMLDesc(virNodeDevicePtr dev, =20 virCheckFlags(0, NULL); =20 - if (!(obj =3D nodeDeviceObjFindByName(dev->name))) + if (!(obj =3D nodeDeviceObjFindByName(device->name))) return NULL; def =3D virNodeDeviceObjGetDef(obj); =20 - if (virNodeDeviceGetXMLDescEnsureACL(dev->conn, def) < 0) + if (virNodeDeviceGetXMLDescEnsureACL(device->conn, def) < 0) goto cleanup; =20 if (nodeDeviceUpdateDriverName(def) < 0) @@ -375,17 +375,17 @@ nodeDeviceGetXMLDesc(virNodeDevicePtr dev, =20 =20 char * -nodeDeviceGetParent(virNodeDevicePtr dev) +nodeDeviceGetParent(virNodeDevicePtr device) { virNodeDeviceObjPtr obj; virNodeDeviceDefPtr def; char *ret =3D NULL; =20 - if (!(obj =3D nodeDeviceObjFindByName(dev->name))) + if (!(obj =3D nodeDeviceObjFindByName(device->name))) return NULL; def =3D virNodeDeviceObjGetDef(obj); =20 - if (virNodeDeviceGetParentEnsureACL(dev->conn, def) < 0) + if (virNodeDeviceGetParentEnsureACL(device->conn, def) < 0) goto cleanup; =20 if (def->parent) { @@ -403,7 +403,7 @@ nodeDeviceGetParent(virNodeDevicePtr dev) =20 =20 int -nodeDeviceNumOfCaps(virNodeDevicePtr dev) +nodeDeviceNumOfCaps(virNodeDevicePtr device) { virNodeDeviceObjPtr obj; virNodeDeviceDefPtr def; @@ -411,11 +411,11 @@ nodeDeviceNumOfCaps(virNodeDevicePtr dev) int ncaps =3D 0; int ret =3D -1; =20 - if (!(obj =3D nodeDeviceObjFindByName(dev->name))) + if (!(obj =3D nodeDeviceObjFindByName(device->name))) return -1; def =3D virNodeDeviceObjGetDef(obj); =20 - if (virNodeDeviceNumOfCapsEnsureACL(dev->conn, def) < 0) + if (virNodeDeviceNumOfCapsEnsureACL(device->conn, def) < 0) goto cleanup; =20 for (caps =3D def->caps; caps; caps =3D caps->next) { @@ -442,7 +442,7 @@ nodeDeviceNumOfCaps(virNodeDevicePtr dev) =20 =20 int -nodeDeviceListCaps(virNodeDevicePtr dev, +nodeDeviceListCaps(virNodeDevicePtr device, char **const names, int maxnames) { @@ -452,11 +452,11 @@ nodeDeviceListCaps(virNodeDevicePtr dev, int ncaps =3D 0; int ret =3D -1; =20 - if (!(obj =3D nodeDeviceObjFindByName(dev->name))) + if (!(obj =3D nodeDeviceObjFindByName(device->name))) return -1; def =3D virNodeDeviceObjGetDef(obj); =20 - if (virNodeDeviceListCapsEnsureACL(dev->conn, def) < 0) + if (virNodeDeviceListCapsEnsureACL(device->conn, def) < 0) goto cleanup; =20 for (caps =3D def->caps; caps && ncaps < maxnames; caps =3D caps->next= ) { @@ -530,7 +530,7 @@ nodeDeviceFindNewDevice(virConnectPtr conn, const char *wwnn, const char *wwpn) { - virNodeDevicePtr dev =3D NULL; + virNodeDevicePtr device =3D NULL; time_t start =3D 0, now =3D 0; =20 /* The thread that creates the device takes the driver lock, so we @@ -546,9 +546,9 @@ nodeDeviceFindNewDevice(virConnectPtr conn, =20 virWaitForDevices(); =20 - dev =3D nodeDeviceLookupSCSIHostByWWN(conn, wwnn, wwpn, 0); + device =3D nodeDeviceLookupSCSIHostByWWN(conn, wwnn, wwpn, 0); =20 - if (dev !=3D NULL) + if (device !=3D NULL) break; =20 sleep(5); @@ -558,7 +558,7 @@ nodeDeviceFindNewDevice(virConnectPtr conn, =20 nodeDeviceLock(); =20 - return dev; + return device; } =20 =20 @@ -570,7 +570,7 @@ nodeDeviceCreateXML(virConnectPtr conn, virNodeDeviceDefPtr def =3D NULL; char *wwnn =3D NULL, *wwpn =3D NULL; int parent_host =3D -1; - virNodeDevicePtr dev =3D NULL; + virNodeDevicePtr device =3D NULL; const char *virt_type =3D NULL; =20 virCheckFlags(0, NULL); @@ -594,11 +594,11 @@ nodeDeviceCreateXML(virConnectPtr conn, if (virVHBAManageVport(parent_host, wwpn, wwnn, VPORT_CREATE) < 0) goto cleanup; =20 - dev =3D nodeDeviceFindNewDevice(conn, wwnn, wwpn); + device =3D nodeDeviceFindNewDevice(conn, wwnn, wwpn); /* We don't check the return value, because one way or another, * we're returning what we get... */ =20 - if (dev =3D=3D NULL) + if (device =3D=3D 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; } =20 =20 int -nodeDeviceDestroy(virNodeDevicePtr dev) +nodeDeviceDestroy(virNodeDevicePtr device) { int ret =3D -1; virNodeDeviceObjPtr obj =3D NULL; @@ -621,13 +621,13 @@ nodeDeviceDestroy(virNodeDevicePtr dev) char *wwnn =3D NULL, *wwpn =3D NULL; int parent_host =3D -1; =20 - if (!(obj =3D nodeDeviceObjFindByName(dev->name))) + if (!(obj =3D nodeDeviceObjFindByName(device->name))) return -1; def =3D virNodeDeviceObjGetDef(obj); =20 nodeDeviceLock(); =20 - if (virNodeDeviceDestroyEnsureACL(dev->conn, def) < 0) + if (virNodeDeviceDestroyEnsureACL(device->conn, def) < 0) goto cleanup; =20 if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) < 0) @@ -659,7 +659,7 @@ nodeDeviceDestroy(virNodeDevicePtr dev) =20 int nodeConnectNodeDeviceEventRegisterAny(virConnectPtr conn, - virNodeDevicePtr dev, + virNodeDevicePtr device, int eventID, virConnectNodeDeviceEventGenericCall= back callback, void *opaque, @@ -671,7 +671,7 @@ nodeConnectNodeDeviceEventRegisterAny(virConnectPtr con= n, goto cleanup; =20 if (virNodeDeviceEventStateRegisterID(conn, driver->nodeDeviceEventSta= te, - dev, eventID, callback, + device, eventID, callback, opaque, freecb, &callbackID) < 0) callbackID =3D -1; cleanup: diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_devic= e_hal.c index c354cd3..0d9ec18 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -449,7 +449,7 @@ dev_create(const char *udi) { LibHalContext *ctx; char *parent_key =3D NULL; - virNodeDeviceObjPtr dev =3D NULL; + virNodeDeviceObjPtr obj =3D NULL; virNodeDeviceDefPtr def =3D NULL; virNodeDeviceDefPtr objdef; const char *name =3D 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); =20 - if (!(dev =3D virNodeDeviceObjAssignDef(&driver->devs, def))) { + if (!(obj =3D virNodeDeviceObjAssignDef(&driver->devs, def))) { VIR_FREE(devicePath); goto failure; } - objdef =3D virNodeDeviceObjGetDef(dev); + objdef =3D virNodeDeviceObjGetDef(obj); =20 objdef->sysfs_path =3D devicePath; =20 - virNodeDeviceObjUnlock(dev); + virNodeDeviceObjUnlock(obj); =20 nodeDeviceUnlock(); return; @@ -506,21 +506,21 @@ static void dev_refresh(const char *udi) { const char *name =3D hal_name(udi); - virNodeDeviceObjPtr dev; + virNodeDeviceObjPtr obj; =20 nodeDeviceLock(); - dev =3D virNodeDeviceObjFindByName(&driver->devs, name); - if (dev) { + obj =3D virNodeDeviceObjFindByName(&driver->devs, name); + if (obj) { /* 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(); =20 - if (dev) + if (obj) dev_create(udi); } =20 @@ -538,14 +538,14 @@ device_removed(LibHalContext *ctx ATTRIBUTE_UNUSED, const char *udi) { const char *name =3D hal_name(udi); - virNodeDeviceObjPtr dev; + virNodeDeviceObjPtr obj; =20 nodeDeviceLock(); - dev =3D virNodeDeviceObjFindByName(&driver->devs, name); + obj =3D virNodeDeviceObjFindByName(&driver->devs, name); VIR_DEBUG("%s", name); - if (dev) { - virNodeDeviceObjRemove(&driver->devs, dev); - virNodeDeviceObjFree(dev); + if (obj) { + virNodeDeviceObjRemove(&driver->devs, obj); + virNodeDeviceObjFree(obj); } else { VIR_DEBUG("no device named %s", name); } @@ -558,17 +558,17 @@ device_cap_added(LibHalContext *ctx, const char *udi, const char *cap) { const char *name =3D hal_name(udi); - virNodeDeviceObjPtr dev; + virNodeDeviceObjPtr obj; virNodeDeviceDefPtr def; =20 nodeDeviceLock(); - dev =3D virNodeDeviceObjFindByName(&driver->devs, name); + obj =3D virNodeDeviceObjFindByName(&driver->devs, name); nodeDeviceUnlock(); VIR_DEBUG("%s %s", cap, name); - if (dev) { - def =3D virNodeDeviceObjGetDef(dev); + if (obj) { + def =3D virNodeDeviceObjGetDef(obj); (void)gather_capability(ctx, udi, cap, &def->caps); - virNodeDeviceObjUnlock(dev); + virNodeDeviceObjUnlock(obj); } else { VIR_DEBUG("no device named %s", name); } diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index 819e4e7..708bc9a 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1312,20 +1312,18 @@ udevGetDeviceDetails(struct udev_device *device, static int udevRemoveOneDevice(struct udev_device *device) { - virNodeDeviceObjPtr dev =3D NULL; + virNodeDeviceObjPtr obj =3D NULL; virNodeDeviceDefPtr def; virObjectEventPtr event =3D NULL; const char *name =3D NULL; =20 name =3D udev_device_get_syspath(device); - dev =3D virNodeDeviceObjFindBySysfsPath(&driver->devs, name); - - if (!dev) { + if (!(obj =3D virNodeDeviceObjFindBySysfsPath(&driver->devs, name))) { VIR_DEBUG("Failed to find device to remove that has udev name '%s'= ", name); return -1; } - def =3D virNodeDeviceObjGetDef(dev); + def =3D virNodeDeviceObjGetDef(obj); =20 event =3D virNodeDeviceEventLifecycleNew(def->name, VIR_NODE_DEVICE_EVENT_DELETED, @@ -1333,8 +1331,8 @@ udevRemoveOneDevice(struct udev_device *device) =20 VIR_DEBUG("Removing device '%s' with sysfs path '%s'", def->name, name); - virNodeDeviceObjRemove(&driver->devs, dev); - virNodeDeviceObjFree(dev); + virNodeDeviceObjRemove(&driver->devs, obj); + virNodeDeviceObjFree(obj); =20 if (event) virObjectEventStateQueue(driver->nodeDeviceEventState, event); @@ -1348,7 +1346,7 @@ udevSetParent(struct udev_device *device, { struct udev_device *parent_device =3D NULL; const char *parent_sysfs_path =3D NULL; - virNodeDeviceObjPtr dev =3D NULL; + virNodeDeviceObjPtr obj =3D NULL; virNodeDeviceDefPtr objdef; int ret =3D -1; =20 @@ -1367,15 +1365,14 @@ udevSetParent(struct udev_device *device, goto cleanup; } =20 - dev =3D virNodeDeviceObjFindBySysfsPath(&driver->devs, - parent_sysfs_path); - if (dev !=3D NULL) { - objdef =3D virNodeDeviceObjGetDef(dev); + if ((obj =3D virNodeDeviceObjFindBySysfsPath(&driver->devs, + parent_sysfs_path))) { + objdef =3D virNodeDeviceObjGetDef(obj); if (VIR_STRDUP(def->parent, objdef->name) < 0) { - virNodeDeviceObjUnlock(dev); + virNodeDeviceObjUnlock(obj); goto cleanup; } - virNodeDeviceObjUnlock(dev); + virNodeDeviceObjUnlock(obj); =20 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 =3D NULL; - virNodeDeviceObjPtr dev =3D NULL; + virNodeDeviceObjPtr obj =3D NULL; virNodeDeviceDefPtr objdef; virObjectEventPtr event =3D NULL; bool new_device =3D true; @@ -1427,18 +1424,17 @@ udevAddOneDevice(struct udev_device *device) if (udevSetParent(device, def) !=3D 0) goto cleanup; =20 - dev =3D virNodeDeviceObjFindByName(&driver->devs, def->name); - if (dev) { - virNodeDeviceObjUnlock(dev); + obj =3D virNodeDeviceObjFindByName(&driver->devs, def->name); + if (obj) { + virNodeDeviceObjUnlock(obj); new_device =3D false; } =20 /* If this is a device change, the old definition will be freed * and the current definition will take its place. */ - dev =3D virNodeDeviceObjAssignDef(&driver->devs, def); - if (dev =3D=3D NULL) + if (!(obj =3D virNodeDeviceObjAssignDef(&driver->devs, def))) goto cleanup; - objdef =3D virNodeDeviceObjGetDef(dev); + objdef =3D virNodeDeviceObjGetDef(obj); =20 if (new_device) event =3D virNodeDeviceEventLifecycleNew(objdef->name, @@ -1447,7 +1443,7 @@ udevAddOneDevice(struct udev_device *device) else event =3D virNodeDeviceEventUpdateNew(objdef->name); =20 - virNodeDeviceObjUnlock(dev); + virNodeDeviceObjUnlock(obj); =20 ret =3D 0; =20 @@ -1710,7 +1706,7 @@ static int udevSetupSystemDev(void) { virNodeDeviceDefPtr def =3D NULL; - virNodeDeviceObjPtr dev =3D NULL; + virNodeDeviceObjPtr obj =3D NULL; int ret =3D -1; =20 if (VIR_ALLOC(def) < 0) @@ -1726,11 +1722,11 @@ udevSetupSystemDev(void) udevGetDMIData(&def->caps->data.system); #endif =20 - dev =3D virNodeDeviceObjAssignDef(&driver->devs, def); - if (dev =3D=3D NULL) + obj =3D virNodeDeviceObjAssignDef(&driver->devs, def); + if (obj =3D=3D NULL) goto cleanup; =20 - virNodeDeviceObjUnlock(dev); + virNodeDeviceObjUnlock(obj); =20 ret =3D 0; =20 --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list