External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

mdev: Cleanup code after commits @daf5081b and @2739a983

Browse Source 
So, because mingw is somehow OK with dereferencing a pointer within a
VIR_DEBUG macro, compared to outside of it to which it complained with a
"potential NULL pointer dereference" error (still a false positive), we
can make the code a tiny bit cleaner.

Sighed-by: Erik Skultety <eskultet@redhat.com>
Signed-off-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Erik Skultety 2017-05-04 15:36:37 +02:00
parent 4727594078
commit 8fc72e1c72
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/virmdev.c
View File

@ -449,13 +449,8 @@ virMediatedDeviceListMarkDevices(virMediatedDeviceListPtr dst,
virObjectLock(dst);
for (i = 0; i < count; i++) {
const char *mdev_path = NULL;
virMediatedDevicePtr mdev = virMediatedDeviceListGet(src, i);
if (!mdev)
goto cleanup;
mdev_path = mdev->path;
if (virMediatedDeviceIsUsed(mdev, dst) ||
virMediatedDeviceSetUsedBy(mdev, drvname, domname) < 0)
goto cleanup;
@ -464,11 +459,11 @@ virMediatedDeviceListMarkDevices(virMediatedDeviceListPtr dst,
* - caller is responsible for NOT freeing devices in @src on success
* - we're responsible for performing a rollback on failure
*/
VIR_DEBUG("Add '%s' to list of active mediated devices used by '%s'",
mdev->path, domname);
if (virMediatedDeviceListAdd(dst, &mdev) < 0)
goto rollback;
VIR_DEBUG("'%s' added to list of active mediated devices used by '%s'",
mdev_path, domname);
}
ret = 0;