From nobody Sun Apr 28 19:33:52 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 1490628674932151.15733747351123; Mon, 27 Mar 2017 08:31:14 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7E95D636FE; Mon, 27 Mar 2017 15:31:13 +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 54EA07D51D; Mon, 27 Mar 2017 15:31:13 +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 11D6918523C5; Mon, 27 Mar 2017 15:31:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2RFVBIr010804 for ; Mon, 27 Mar 2017 11:31:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id C75C677538; Mon, 27 Mar 2017 15:31:11 +0000 (UTC) Received: from caroline.brq.redhat.com (dhcp129-198.brq.redhat.com [10.34.129.198]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4EFFF7755A for ; Mon, 27 Mar 2017 15:31:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7E95D636FE Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.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 7E95D636FE From: Martin Kletzander To: libvir-list@redhat.com Date: Mon, 27 Mar 2017 17:30:54 +0200 Message-Id: <160eecac6000058c7889f12db70d87a864cb7de0.1490628654.git.mkletzan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] hostdev: Fix build with GCC's static analysis in mdev 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 27 Mar 2017 15:31:14 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Similarly to eec3b255d26e7b38bdb0830990569fd91aee661f, fix build with lv_cv_static_analysis=3Dyes. Caused by a4a39d90ab4930750bcbcfccffdf6bb6d310b5d5 --- src/util/virhostdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 2c557f5bbc6b..998df5871539 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -2060,8 +2060,8 @@ virHostdevReAttachMediatedDevices(virHostdevManagerPt= r mgr, continue; virMediatedDeviceGetUsedBy(tmp, &used_by_drvname, &used_by_domname= ); - if (STREQ_NULLABLE(drv_name, used_by_drvname) && - STREQ_NULLABLE(dom_name, used_by_domname)) { + if (used_by_drvname && STREQ(drv_name, used_by_drvname) && + used_by_domname && STREQ(dom_name, used_by_domname)) { VIR_DEBUG("Removing %s dom=3D%s from activeMediatedHostdevs", mdevsrc->uuidstr, dom_name); virMediatedDeviceListDel(mgr->activeMediatedHostdevs, tmp); --=20 2.12.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list