From nobody Sat Feb 7 08:07:45 2026 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 1495199353182409.9804844892195; Fri, 19 May 2017 06:09: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 DC75FC04B302; Fri, 19 May 2017 13:09: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 B77D31841D; Fri, 19 May 2017 13:09:11 +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 60E384A492; Fri, 19 May 2017 13:09:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v4JD92aq005352 for ; Fri, 19 May 2017 09:09:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4563D80E7D; Fri, 19 May 2017 13:09:02 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-18.phx2.redhat.com [10.3.116.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED6AD80E78 for ; Fri, 19 May 2017 13:09:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DC75FC04B302 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.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 DC75FC04B302 From: John Ferlan To: libvir-list@redhat.com Date: Fri, 19 May 2017 09:08:51 -0400 Message-Id: <20170519130853.13965-12-jferlan@redhat.com> In-Reply-To: <20170519130853.13965-1-jferlan@redhat.com> References: <20170519130853.13965-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 11/13] nodedev: Introduce virNodeDeviceObjGetDef 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.31]); Fri, 19 May 2017 13:09:12 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" In preparation for privatizing the virNodeDeviceObj - create an accessor for the @def field and then use it for various callers. Signed-off-by: John Ferlan --- src/conf/virnodedeviceobj.c | 7 +++++ src/conf/virnodedeviceobj.h | 2 ++ src/libvirt_private.syms | 1 + src/node_device/node_device_driver.c | 52 ++++++++++++++++++++++----------= ---- src/node_device/node_device_hal.c | 11 +++++--- src/node_device/node_device_udev.c | 35 ++++++++++++------------ src/test/test_driver.c | 38 +++++++++++++++++--------- 7 files changed, 92 insertions(+), 54 deletions(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 3a833e1..dcf871c 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -33,6 +33,13 @@ VIR_LOG_INIT("conf.virnodedeviceobj"); =20 =20 +virNodeDeviceDefPtr +virNodeDeviceObjGetDef(virNodeDeviceObjPtr obj) +{ + return obj->def; +} + + static int virNodeDeviceObjHasCap(const virNodeDeviceObj *obj, const char *cap) diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h index b8b534b..135a424 100644 --- a/src/conf/virnodedeviceobj.h +++ b/src/conf/virnodedeviceobj.h @@ -39,6 +39,8 @@ struct _virNodeDeviceDriverState { virObjectEventStatePtr nodeDeviceEventState; }; =20 +virNodeDeviceDefPtr +virNodeDeviceObjGetDef(virNodeDeviceObjPtr obj); =20 virNodeDeviceObjPtr virNodeDeviceObjFindByName(virNodeDeviceObjListPtr devs, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d8602e6..2d12b2e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -960,6 +960,7 @@ virNetworkObjUpdateAssignDef; virNodeDeviceObjAssignDef; virNodeDeviceObjFindByName; virNodeDeviceObjFindBySysfsPath; +virNodeDeviceObjGetDef; virNodeDeviceObjGetNames; virNodeDeviceObjGetParentHost; virNodeDeviceObjListExport; diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index fe2cb3c..2c79044 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -253,16 +253,18 @@ nodeDeviceLookupByName(virConnectPtr conn, const char *name) { virNodeDeviceObjPtr obj; + virNodeDeviceDefPtr def; virNodeDevicePtr device =3D NULL; =20 if (!(obj =3D nodeDeviceObjFindByName(name))) return NULL; + def =3D virNodeDeviceObjGetDef(obj); =20 - if (virNodeDeviceLookupByNameEnsureACL(conn, obj->def) < 0) + if (virNodeDeviceLookupByNameEnsureACL(conn, def) < 0) goto cleanup; =20 if ((device =3D virGetNodeDevice(conn, name))) { - if (VIR_STRDUP(device->parent, obj->def->parent) < 0) + if (VIR_STRDUP(device->parent, def->parent) < 0) virObjectUnref(device); } =20 @@ -282,6 +284,7 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, virNodeDeviceObjListPtr devs =3D &driver->devs; virNodeDevCapsDefPtr cap =3D NULL; virNodeDeviceObjPtr obj =3D NULL; + virNodeDeviceDefPtr def; virNodeDevicePtr device =3D NULL; =20 virCheckFlags(0, NULL); @@ -291,7 +294,8 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, for (i =3D 0; i < devs->count; i++) { obj =3D devs->objs[i]; virNodeDeviceObjLock(obj); - cap =3D obj->def->caps; + def =3D virNodeDeviceObjGetDef(obj); + cap =3D def->caps; =20 while (cap) { if (cap->data.type =3D=3D VIR_NODE_DEV_CAP_SCSI_HOST) { @@ -301,11 +305,11 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, if (STREQ(cap->data.scsi_host.wwnn, wwnn) && STREQ(cap->data.scsi_host.wwpn, wwpn)) { =20 - if (virNodeDeviceLookupSCSIHostByWWNEnsureACL(conn= , obj->def) < 0) + if (virNodeDeviceLookupSCSIHostByWWNEnsureACL(conn= , def) < 0) goto out; =20 - if ((device =3D virGetNodeDevice(conn, obj->def->n= ame))) { - if (VIR_STRDUP(device->parent, obj->def->paren= t) < 0) + if ((device =3D virGetNodeDevice(conn, def->name))= ) { + if (VIR_STRDUP(device->parent, def->parent) < = 0) virObjectUnref(device); } virNodeDeviceObjUnlock(obj); @@ -330,23 +334,25 @@ nodeDeviceGetXMLDesc(virNodeDevicePtr device, unsigned int flags) { virNodeDeviceObjPtr obj; + virNodeDeviceDefPtr def; char *ret =3D NULL; =20 virCheckFlags(0, NULL); =20 if (!(obj =3D nodeDeviceObjFindByName(device->name))) return NULL; + def =3D virNodeDeviceObjGetDef(obj); =20 - if (virNodeDeviceGetXMLDescEnsureACL(device->conn, obj->def) < 0) + if (virNodeDeviceGetXMLDescEnsureACL(device->conn, def) < 0) goto cleanup; =20 - if (nodeDeviceUpdateDriverName(obj->def) < 0) + if (nodeDeviceUpdateDriverName(def) < 0) goto cleanup; =20 - if (nodeDeviceUpdateCaps(obj->def) < 0) + if (nodeDeviceUpdateCaps(def) < 0) goto cleanup; =20 - ret =3D virNodeDeviceDefFormat(obj->def); + ret =3D virNodeDeviceDefFormat(def); =20 cleanup: virNodeDeviceObjUnlock(obj); @@ -358,16 +364,18 @@ char * nodeDeviceGetParent(virNodeDevicePtr device) { virNodeDeviceObjPtr obj; + virNodeDeviceDefPtr def; char *ret =3D NULL; =20 if (!(obj =3D nodeDeviceObjFindByName(device->name))) return NULL; + def =3D virNodeDeviceObjGetDef(obj); =20 - if (virNodeDeviceGetParentEnsureACL(device->conn, obj->def) < 0) + if (virNodeDeviceGetParentEnsureACL(device->conn, def) < 0) goto cleanup; =20 - if (obj->def->parent) { - if (VIR_STRDUP(ret, obj->def->parent) < 0) + if (def->parent) { + if (VIR_STRDUP(ret, def->parent) < 0) goto cleanup; } else { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -384,17 +392,19 @@ int nodeDeviceNumOfCaps(virNodeDevicePtr device) { virNodeDeviceObjPtr obj; + virNodeDeviceDefPtr def; virNodeDevCapsDefPtr caps; int ncaps =3D 0; int ret =3D -1; =20 if (!(obj =3D nodeDeviceObjFindByName(device->name))) return -1; + def =3D virNodeDeviceObjGetDef(obj); =20 - if (virNodeDeviceNumOfCapsEnsureACL(device->conn, obj->def) < 0) + if (virNodeDeviceNumOfCapsEnsureACL(device->conn, def) < 0) goto cleanup; =20 - for (caps =3D obj->def->caps; caps; caps =3D caps->next) { + for (caps =3D def->caps; caps; caps =3D caps->next) { ++ncaps; =20 if (caps->data.type =3D=3D VIR_NODE_DEV_CAP_SCSI_HOST) { @@ -423,17 +433,19 @@ nodeDeviceListCaps(virNodeDevicePtr device, int maxnames) { virNodeDeviceObjPtr obj; + virNodeDeviceDefPtr def; virNodeDevCapsDefPtr caps; int ncaps =3D 0; int ret =3D -1; =20 if (!(obj =3D nodeDeviceObjFindByName(device->name))) return -1; + def =3D virNodeDeviceObjGetDef(obj); =20 - if (virNodeDeviceListCapsEnsureACL(device->conn, obj->def) < 0) + if (virNodeDeviceListCapsEnsureACL(device->conn, def) < 0) goto cleanup; =20 - for (caps =3D obj->def->caps; caps && ncaps < maxnames; caps =3D caps-= >next) { + for (caps =3D def->caps; caps && ncaps < maxnames; caps =3D caps->next= ) { if (VIR_STRDUP(names[ncaps++], virNodeDevCapTypeToString(caps->dat= a.type)) < 0) goto cleanup; =20 @@ -595,20 +607,20 @@ nodeDeviceDestroy(virNodeDevicePtr device) =20 if (!(obj =3D nodeDeviceObjFindByName(device->name))) return -1; + def =3D virNodeDeviceObjGetDef(obj); =20 nodeDeviceLock(); =20 - if (virNodeDeviceDestroyEnsureACL(device->conn, obj->def) < 0) + if (virNodeDeviceDestroyEnsureACL(device->conn, def) < 0) goto cleanup; =20 - if (virNodeDeviceGetWWNs(obj->def, &wwnn, &wwpn) < 0) + if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) < 0) goto cleanup; =20 /* virNodeDeviceGetParentHost will cause the device object's lock * to be taken, so grab the object def which will have the various * fields used to search (name, parent, parent_wwnn, parent_wwpn, * or parent_fabric_wwn) and drop the object lock. */ - def =3D obj->def; virNodeDeviceObjUnlock(obj); obj =3D NULL; if ((parent_host =3D virNodeDeviceObjGetParentHost(&driver->devs, def, diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_devic= e_hal.c index 11b9aab..17cd130 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -459,6 +459,7 @@ dev_create(const char *udi) char *parent_key =3D NULL; virNodeDeviceObjPtr obj =3D NULL; virNodeDeviceDefPtr def =3D NULL; + virNodeDeviceDefPtr objdef; const char *name =3D hal_name(udi); int rv; char *privData; @@ -493,15 +494,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 - obj =3D virNodeDeviceObjAssignDef(&driver->devs, def); - if (!obj) { + if (!(obj =3D virNodeDeviceObjAssignDef(&driver->devs, def))) { VIR_FREE(devicePath); goto failure; } + objdef =3D virNodeDeviceObjGetDef(obj); =20 obj->privateData =3D privData; obj->privateFree =3D free_udi; - obj->def->sysfs_path =3D devicePath; + objdef->sysfs_path =3D devicePath; =20 virNodeDeviceObjUnlock(obj); =20 @@ -571,13 +572,15 @@ device_cap_added(LibHalContext *ctx, { const char *name =3D hal_name(udi); virNodeDeviceObjPtr obj; + virNodeDeviceDefPtr def; =20 nodeDeviceLock(); obj =3D virNodeDeviceObjFindByName(&driver->devs, name); nodeDeviceUnlock(); VIR_DEBUG("%s %s", cap, name); if (obj) { - (void)gather_capability(ctx, udi, cap, &obj->def->caps); + def =3D virNodeDeviceObjGetDef(obj); + (void)gather_capability(ctx, udi, cap, &def->caps); 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 6fd8896..65ad10c 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1277,32 +1277,29 @@ static int udevRemoveOneDevice(struct udev_device *device) { virNodeDeviceObjPtr obj =3D NULL; + virNodeDeviceDefPtr def; virObjectEventPtr event =3D NULL; const char *name =3D NULL; - int ret =3D -1; =20 name =3D udev_device_get_syspath(device); - obj =3D virNodeDeviceObjFindBySysfsPath(&driver->devs, name); - - if (!obj) { + if (!(obj =3D virNodeDeviceObjFindBySysfsPath(&driver->devs, name))) { VIR_DEBUG("Failed to find device to remove that has udev name '%s'= ", name); - goto cleanup; + return -1; } + def =3D virNodeDeviceObjGetDef(obj); =20 - event =3D virNodeDeviceEventLifecycleNew(obj->def->name, + event =3D virNodeDeviceEventLifecycleNew(def->name, VIR_NODE_DEVICE_EVENT_DELETED, 0); =20 VIR_DEBUG("Removing device '%s' with sysfs path '%s'", - obj->def->name, name); + def->name, name); virNodeDeviceObjRemove(&driver->devs, &obj); =20 - ret =3D 0; - cleanup: if (event) virObjectEventStateQueue(driver->nodeDeviceEventState, event); - return ret; + return 0; } =20 =20 @@ -1313,6 +1310,7 @@ udevSetParent(struct udev_device *device, struct udev_device *parent_device =3D NULL; const char *parent_sysfs_path =3D NULL; virNodeDeviceObjPtr obj =3D NULL; + virNodeDeviceDefPtr objdef; int ret =3D -1; =20 parent_device =3D device; @@ -1330,10 +1328,10 @@ udevSetParent(struct udev_device *device, goto cleanup; } =20 - obj =3D virNodeDeviceObjFindBySysfsPath(&driver->devs, - parent_sysfs_path); - if (obj !=3D NULL) { - if (VIR_STRDUP(def->parent, obj->def->name) < 0) { + if ((obj =3D virNodeDeviceObjFindBySysfsPath(&driver->devs, + parent_sysfs_path))) { + objdef =3D virNodeDeviceObjGetDef(obj); + if (VIR_STRDUP(objdef->parent, def->name) < 0) { virNodeDeviceObjUnlock(obj); goto cleanup; } @@ -1360,6 +1358,7 @@ udevAddOneDevice(struct udev_device *device) { virNodeDeviceDefPtr def =3D NULL; virNodeDeviceObjPtr obj =3D NULL; + virNodeDeviceDefPtr objdef; virObjectEventPtr event =3D NULL; bool new_device =3D true; int ret =3D -1; @@ -1396,16 +1395,16 @@ udevAddOneDevice(struct udev_device *device) =20 /* If this is a device change, the old definition will be freed * and the current definition will take its place. */ - obj =3D virNodeDeviceObjAssignDef(&driver->devs, def); - if (obj =3D=3D NULL) + if (!(obj =3D virNodeDeviceObjAssignDef(&driver->devs, def))) goto cleanup; + objdef =3D virNodeDeviceObjGetDef(obj); =20 if (new_device) - event =3D virNodeDeviceEventLifecycleNew(obj->def->name, + event =3D virNodeDeviceEventLifecycleNew(objdef->name, VIR_NODE_DEVICE_EVENT_CREAT= ED, 0); else - event =3D virNodeDeviceEventUpdateNew(obj->def->name); + event =3D virNodeDeviceEventUpdateNew(objdef->name); =20 virNodeDeviceObjUnlock(obj); =20 diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 3389edd..206fdf9 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5319,13 +5319,15 @@ testNodeDeviceLookupByName(virConnectPtr conn, cons= t char *name) { testDriverPtr driver =3D conn->privateData; virNodeDeviceObjPtr obj; + virNodeDeviceDefPtr def; virNodeDevicePtr ret =3D NULL; =20 if (!(obj =3D testNodeDeviceObjFindByName(driver, name))) return NULL; + def =3D virNodeDeviceObjGetDef(obj); =20 if ((ret =3D virGetNodeDevice(conn, name))) { - if (VIR_STRDUP(ret->parent, obj->def->parent) < 0) + if (VIR_STRDUP(ret->parent, def->parent) < 0) virObjectUnref(ret); } =20 @@ -5346,7 +5348,7 @@ testNodeDeviceGetXMLDesc(virNodeDevicePtr dev, if (!(obj =3D testNodeDeviceObjFindByName(driver, dev->name))) return NULL; =20 - ret =3D virNodeDeviceDefFormat(obj->def); + ret =3D virNodeDeviceDefFormat(virNodeDeviceObjGetDef(obj)); =20 virNodeDeviceObjUnlock(obj); return ret; @@ -5357,13 +5359,15 @@ testNodeDeviceGetParent(virNodeDevicePtr dev) { testDriverPtr driver =3D dev->conn->privateData; virNodeDeviceObjPtr obj; + virNodeDeviceDefPtr def; char *ret =3D NULL; =20 if (!(obj =3D testNodeDeviceObjFindByName(driver, dev->name))) return NULL; + def =3D virNodeDeviceObjGetDef(obj); =20 - if (obj->def->parent) { - ignore_value(VIR_STRDUP(ret, obj->def->parent)); + if (def->parent) { + ignore_value(VIR_STRDUP(ret, def->parent)); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no parent for this device")); @@ -5379,13 +5383,15 @@ testNodeDeviceNumOfCaps(virNodeDevicePtr dev) { testDriverPtr driver =3D dev->conn->privateData; virNodeDeviceObjPtr obj; + virNodeDeviceDefPtr def; virNodeDevCapsDefPtr caps; int ncaps =3D 0; =20 if (!(obj =3D testNodeDeviceObjFindByName(driver, dev->name))) return -1; + def =3D virNodeDeviceObjGetDef(obj); =20 - for (caps =3D obj->def->caps; caps; caps =3D caps->next) + for (caps =3D def->caps; caps; caps =3D caps->next) ++ncaps; =20 virNodeDeviceObjUnlock(obj); @@ -5398,13 +5404,15 @@ testNodeDeviceListCaps(virNodeDevicePtr dev, char *= *const names, int maxnames) { testDriverPtr driver =3D dev->conn->privateData; virNodeDeviceObjPtr obj; + virNodeDeviceDefPtr def; virNodeDevCapsDefPtr caps; int ncaps =3D 0; =20 if (!(obj =3D testNodeDeviceObjFindByName(driver, dev->name))) return -1; + def =3D virNodeDeviceObjGetDef(obj); =20 - for (caps =3D obj->def->caps; caps && ncaps < maxnames; caps =3D caps-= >next) { + for (caps =3D def->caps; caps && ncaps < maxnames; caps =3D caps->next= ) { if (VIR_STRDUP(names[ncaps], virNodeDevCapTypeToString(caps->data.type)) < 0) goto error; @@ -5431,6 +5439,7 @@ testNodeDeviceMockCreateVport(testDriverPtr driver, virNodeDeviceDefPtr def =3D NULL; virNodeDevCapsDefPtr caps; virNodeDeviceObjPtr obj =3D NULL, objcopy =3D NULL; + virNodeDeviceDefPtr objdef; virObjectEventPtr event =3D NULL; =20 /* In the real code, we'd call virVHBAManageVport which would take the @@ -5445,7 +5454,7 @@ testNodeDeviceMockCreateVport(testDriverPtr driver, if (!(objcopy =3D virNodeDeviceObjFindByName(&driver->devs, "scsi_host= 11"))) goto cleanup; =20 - xml =3D virNodeDeviceDefFormat(objcopy->def); + xml =3D virNodeDeviceDefFormat(virNodeDeviceObjGetDef(objcopy)); virNodeDeviceObjUnlock(objcopy); if (!xml) goto cleanup; @@ -5485,8 +5494,9 @@ testNodeDeviceMockCreateVport(testDriverPtr driver, if (!(obj =3D virNodeDeviceObjAssignDef(&driver->devs, def))) goto cleanup; def =3D NULL; + objdef =3D virNodeDeviceObjGetDef(obj); =20 - event =3D virNodeDeviceEventLifecycleNew(obj->def->name, + event =3D virNodeDeviceEventLifecycleNew(objdef->name, VIR_NODE_DEVICE_EVENT_CREATED, 0); testObjectEventQueue(driver, event); @@ -5508,6 +5518,7 @@ testNodeDeviceCreateXML(virConnectPtr conn, char *wwnn =3D NULL, *wwpn =3D NULL; virNodeDevicePtr dev =3D NULL, ret =3D NULL; virNodeDeviceObjPtr obj =3D NULL; + virNodeDeviceDefPtr objdef; =20 virCheckFlags(0, NULL); =20 @@ -5535,8 +5546,9 @@ testNodeDeviceCreateXML(virConnectPtr conn, * work properly, we need to drop our lock */ if (!(obj =3D testNodeDeviceMockCreateVport(driver, wwnn, wwpn))) goto cleanup; + objdef =3D virNodeDeviceObjGetDef(obj); =20 - if (!(dev =3D virGetNodeDevice(conn, obj->def->name))) + if (!(dev =3D virGetNodeDevice(conn, objdef->name))) goto cleanup; =20 VIR_FREE(dev->parent); @@ -5563,16 +5575,18 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) int ret =3D 0; testDriverPtr driver =3D dev->conn->privateData; virNodeDeviceObjPtr obj =3D NULL; + virNodeDeviceDefPtr def; char *parent_name =3D NULL, *wwnn =3D NULL, *wwpn =3D NULL; virObjectEventPtr event =3D NULL; =20 if (!(obj =3D testNodeDeviceObjFindByName(driver, dev->name))) return -1; + def =3D virNodeDeviceObjGetDef(obj); =20 - if (virNodeDeviceGetWWNs(obj->def, &wwnn, &wwpn) =3D=3D -1) + if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) =3D=3D -1) goto cleanup; =20 - if (VIR_STRDUP(parent_name, obj->def->parent) < 0) + if (VIR_STRDUP(parent_name, def->parent) < 0) goto cleanup; =20 /* virNodeDeviceGetParentHost will cause the device object's lock to be @@ -5583,7 +5597,7 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) =20 /* We do this just for basic validation, but also avoid finding a * vport capable HBA if for some reason our vHBA doesn't exist */ - if (virNodeDeviceObjGetParentHost(&driver->devs, obj->def, + if (virNodeDeviceObjGetParentHost(&driver->devs, def, EXISTING_DEVICE) < 0) { obj =3D NULL; goto cleanup; --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list