From: Erik Skultety Date: Fri, 28 Apr 2017 05:52:52 +0000 (+0200) Subject: util: mdev: Use a local variable instead of a direct pointer access X-Git-Tag: v3.3.0~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2739a983f235f0d92d210800d61bd1a195f01850;p=thirdparty%2Flibvirt.git util: mdev: Use a local variable instead of a direct pointer access Use a local variable to hold data, rather than accessing the pointer after calling virMediatedDeviceListAdd (therefore VIR_APPEND_ELEMENT). Although not causing an issue at the moment, this change is a necessary prerequisite for tweaking virMediatedDeviceListAdd in a separate patch, which will take a reference for the source pointer (instead of pointer value) and will clear it along the way. Signed-off-by: Erik Skultety Reviewed-by: Laine Stump Reviewed-by: Pavel Hrdina --- diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 2a1ade7390..c1499d2387 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -447,20 +447,21 @@ virMediatedDeviceListMarkDevices(virMediatedDeviceListPtr dst, virObjectLock(dst); for (i = 0; i < count; i++) { virMediatedDevicePtr mdev = virMediatedDeviceListGet(src, i); + const char *mdev_path = mdev->path; if (virMediatedDeviceIsUsed(mdev, dst) || virMediatedDeviceSetUsedBy(mdev, drvname, domname) < 0) goto cleanup; /* Copy mdev references to the driver list: - * - caller is responsible for NOT freeing devices in @list on success + * - caller is responsible for NOT freeing devices in @src on success * - we're responsible for performing a rollback on failure */ if (virMediatedDeviceListAdd(dst, mdev) < 0) goto rollback; VIR_DEBUG("'%s' added to list of active mediated devices used by '%s'", - mdev->path, domname); + mdev_path, domname); } ret = 0;