From nobody Mon May 6 15:54:08 2024 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 1493910218666905.2811724304778; Thu, 4 May 2017 08:03:38 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AA1367AEA1; Thu, 4 May 2017 15:03:32 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 832DA7D95D; Thu, 4 May 2017 15:03:32 +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 24C9A18523CD; Thu, 4 May 2017 15:03:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v44F3Nxb007026 for ; Thu, 4 May 2017 11:03:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 386F319E87; Thu, 4 May 2017 15:03:23 +0000 (UTC) Received: from beluga.usersys.redhat.com (dhcp129-94.brq.redhat.com [10.34.129.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BF167D94A; Thu, 4 May 2017 15:03:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AA1367AEA1 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.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 AA1367AEA1 From: Erik Skultety To: libvir-list@redhat.com Date: Thu, 4 May 2017 17:03:40 +0200 Message-Id: <2f6928a179a3089ce10440896f7832b32d0a1c0b.1493910174.git.eskultet@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Erik Skultety Subject: [libvirt] [PATCH] mdev: Cleanup code after commits @daf5081b and @2739a983 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 04 May 2017 15:03:33 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Erik Skultety --- src/util/virmdev.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 174f48cb3..bd8e3f8de 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -449,13 +449,8 @@ virMediatedDeviceListMarkDevices(virMediatedDeviceList= Ptr dst, virObjectLock(dst); for (i =3D 0; i < count; i++) { - const char *mdev_path =3D NULL; virMediatedDevicePtr mdev =3D virMediatedDeviceListGet(src, i); - if (!mdev) - goto cleanup; - - mdev_path =3D mdev->path; if (virMediatedDeviceIsUsed(mdev, dst) || virMediatedDeviceSetUsedBy(mdev, drvname, domname) < 0) goto cleanup; @@ -464,11 +459,11 @@ virMediatedDeviceListMarkDevices(virMediatedDeviceLis= tPtr dst, * - caller is responsible for NOT freeing devices in @src on succ= ess * - 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 =3D 0; -- 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list