From nobody Fri May 3 19:51:27 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 1498650178509203.1735126854419; Wed, 28 Jun 2017 04:42:58 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0CBA57F3E2; Wed, 28 Jun 2017 11:42:56 +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 C989F5C3FB; Wed, 28 Jun 2017 11:42:55 +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 C37E51833033; Wed, 28 Jun 2017 11:42:54 +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 v5SBbgRL004298 for ; Wed, 28 Jun 2017 07:37:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 654DA7ABEC; Wed, 28 Jun 2017 11:37:42 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-36.phx2.redhat.com [10.3.116.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B7105C3FB for ; Wed, 28 Jun 2017 11:37:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0CBA57F3E2 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 0CBA57F3E2 From: John Ferlan To: libvir-list@redhat.com Date: Wed, 28 Jun 2017 07:37:35 -0400 Message-Id: <20170628113738.27502-2-jferlan@redhat.com> In-Reply-To: <20170628113738.27502-1-jferlan@redhat.com> References: <20170628113738.27502-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/4] nodedev: Add check for NULL obj before call Unlock 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 28 Jun 2017 11:42:57 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Commit id '95ea171b' was a bit too aggressive in removing the if (obj) check since cleanup is reachable after Unlock and obj =3D NULL. Signed-off-by: John Ferlan --- src/node_device/node_device_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index bc5c0e5..5bf202e 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -650,7 +650,8 @@ nodeDeviceDestroy(virNodeDevicePtr dev) =20 cleanup: nodeDeviceUnlock(); - virNodeDeviceObjUnlock(obj); + if (obj) + virNodeDeviceObjUnlock(obj); VIR_FREE(wwnn); VIR_FREE(wwpn); return ret; --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 19:51:27 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 1498649891231484.87595557807913; Wed, 28 Jun 2017 04:38:11 -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 6D6607EBD7; Wed, 28 Jun 2017 11:38:08 +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 4483888FF3; Wed, 28 Jun 2017 11:38:08 +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 E88601833033; Wed, 28 Jun 2017 11:38:07 +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 v5SBbgBU004304 for ; Wed, 28 Jun 2017 07:37:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id C16797ABEC; Wed, 28 Jun 2017 11:37:42 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-36.phx2.redhat.com [10.3.116.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87BFE5C3FB for ; Wed, 28 Jun 2017 11:37:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6D6607EBD7 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.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 6D6607EBD7 From: John Ferlan To: libvir-list@redhat.com Date: Wed, 28 Jun 2017 07:37:36 -0400 Message-Id: <20170628113738.27502-3-jferlan@redhat.com> In-Reply-To: <20170628113738.27502-1-jferlan@redhat.com> References: <20170628113738.27502-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/4] hotplug: Create helper to remove vport 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.27]); Wed, 28 Jun 2017 11:38:09 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Combine and "clean up" a bit two places that are removing the vport Signed-off-by: John Ferlan --- src/qemu/qemu_hotplug.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a486fb4..1af85be 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -937,6 +937,23 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, } =20 =20 +static void +qemuDomainNetDeviceVportRemove(virDomainNetDefPtr net) +{ + virNetDevVPortProfilePtr vport =3D virDomainNetGetActualVirtPortProfil= e(net); + + if (!vport) + return; + + if (vport->virtPortType =3D=3D VIR_NETDEV_VPORT_PROFILE_MIDONET) { + ignore_value(virNetDevMidonetUnbindPort(vport)); + } else if (vport->virtPortType =3D=3D VIR_NETDEV_VPORT_PROFILE_OPENVSW= ITCH) { + const char *brname =3D virDomainNetGetActualBridgeName(net); + ignore_value(virNetDevOpenvswitchRemovePort(brname, net->ifname)); + } +} + + int qemuDomainAttachNetDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -954,7 +971,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, size_t queueSize =3D 0; char *nicstr =3D NULL; char *netstr =3D NULL; - virNetDevVPortProfilePtr vport =3D NULL; int ret =3D -1; int vlan; bool releaseaddr =3D false; @@ -1302,16 +1318,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, cfg->stateDir)); } =20 - vport =3D virDomainNetGetActualVirtPortProfile(net); - if (vport) { - if (vport->virtPortType =3D=3D VIR_NETDEV_VPORT_PROFILE_MI= DONET) { - ignore_value(virNetDevMidonetUnbindPort(vport)); - } else if (vport->virtPortType =3D=3D VIR_NETDEV_VPORT_PRO= FILE_OPENVSWITCH) { - ignore_value(virNetDevOpenvswitchRemovePort( - virDomainNetGetActualBridgeName(net), - net->ifname)); - } - } + qemuDomainNetDeviceVportRemove(net); } =20 virDomainNetRemoveHostdev(vm->def, net); @@ -3949,7 +3956,6 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, { virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; - virNetDevVPortProfilePtr vport; virObjectEventPtr event; char *hostnet_name =3D NULL; char *charDevAlias =3D NULL; @@ -4038,16 +4044,7 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, cfg->stateDir)); } =20 - vport =3D virDomainNetGetActualVirtPortProfile(net); - if (vport) { - if (vport->virtPortType =3D=3D VIR_NETDEV_VPORT_PROFILE_MIDONET) { - ignore_value(virNetDevMidonetUnbindPort(vport)); - } else if (vport->virtPortType =3D=3D VIR_NETDEV_VPORT_PROFILE_OPE= NVSWITCH) { - ignore_value(virNetDevOpenvswitchRemovePort( - virDomainNetGetActualBridgeName(net), - net->ifname)); - } - } + qemuDomainNetDeviceVportRemove(net); =20 networkReleaseActualDevice(vm->def, net); virDomainNetDefFree(net); --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 19:51:27 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 1498650185018847.0796009914397; Wed, 28 Jun 2017 04:43:05 -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 406DF3B73D; Wed, 28 Jun 2017 11:43:02 +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 06E24176B4; Wed, 28 Jun 2017 11:43:02 +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 6FA2341F63; Wed, 28 Jun 2017 11:43:01 +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 v5SBbhbW004309 for ; Wed, 28 Jun 2017 07:37:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2807A7ABEC; Wed, 28 Jun 2017 11:37:43 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-36.phx2.redhat.com [10.3.116.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id E37965C3FB for ; Wed, 28 Jun 2017 11:37:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 406DF3B73D Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.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 406DF3B73D From: John Ferlan To: libvir-list@redhat.com Date: Wed, 28 Jun 2017 07:37:37 -0400 Message-Id: <20170628113738.27502-4-jferlan@redhat.com> In-Reply-To: <20170628113738.27502-1-jferlan@redhat.com> References: <20170628113738.27502-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/4] util: Adjust the #ifdef logic in virNetDevBridgeCreate 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.30]); Wed, 28 Jun 2017 11:43:02 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Commit id 'adf846d3' added many ATTRIBUTE_FALLTHROUGH; statements; however, this particular one caught the eye of the Coverity checker which notes that the statement isn't reachable when the # if is true. While it could be considered a false positive, just add an # else in order to make it more obvious. Signed-off-by: John Ferlan --- src/util/virnetdevbridge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index 11b03b4..1361a51 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -478,11 +478,12 @@ virNetDevBridgeCreate(const char *brname) */ rc =3D virNetDevBridgeCreateWithIoctl(brname); goto cleanup; -# endif +# else /* intentionally fall through if virNetDevBridgeCreateWithIoct= l() * isn't available. */ ATTRIBUTE_FALLTHROUGH; +# endif default: virReportSystemError(-err->error, _("error creating bridge interface %s"), --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 19:51:27 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 1498649896395120.96309699164453; Wed, 28 Jun 2017 04:38:16 -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 4E1BD334594; Wed, 28 Jun 2017 11:38:14 +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 290BE17D11; Wed, 28 Jun 2017 11:38:14 +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 C933941F77; Wed, 28 Jun 2017 11:38: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 v5SBbh9l004314 for ; Wed, 28 Jun 2017 07:37:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 878865C3FB; Wed, 28 Jun 2017 11:37:43 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-36.phx2.redhat.com [10.3.116.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CC5A7ABEC for ; Wed, 28 Jun 2017 11:37:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4E1BD334594 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.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 4E1BD334594 From: John Ferlan To: libvir-list@redhat.com Date: Wed, 28 Jun 2017 07:37:38 -0400 Message-Id: <20170628113738.27502-5-jferlan@redhat.com> In-Reply-To: <20170628113738.27502-1-jferlan@redhat.com> References: <20170628113738.27502-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/4] test: Fix possible ap leak for VIR_TEST_PRELOAD 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.29]); Wed, 28 Jun 2017 11:38:15 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Commit id 'f0469c61e' added the ability to load multiple mock libraries by using the va_start() varable args marker; however, if something within the VIR_TEST_PRELOAD fails, then control is returned to caller without calling va_end. So add a couple more markers to indicat the need to call va_end w/ the ap before returning. Signed-off-by: John Ferlan --- tests/qemucapsprobe.c | 2 +- tests/testutils.c | 4 ++-- tests/testutils.h | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index 662c703..bca43b4 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -48,7 +48,7 @@ main(int argc, char **argv) virThread thread; virQEMUCapsPtr caps; =20 - VIR_TEST_PRELOAD(abs_builddir "/.libs/qemucapsprobemock.so"); + VIR_TEST_PRELOAD(abs_builddir "/.libs/qemucapsprobemock.so", false, NU= LL); =20 if (argc !=3D 2) { fprintf(stderr, "%s QEMU_binary\n", argv[0]); diff --git a/tests/testutils.c b/tests/testutils.c index f455969..16fd3c6 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -904,11 +904,11 @@ int virTestMain(int argc, virLogOutputPtr *outputs =3D NULL; =20 if (getenv("VIR_TEST_FILE_ACCESS")) - VIR_TEST_PRELOAD(TEST_MOCK); + VIR_TEST_PRELOAD(TEST_MOCK, false, NULL); =20 va_start(ap, func); while ((lib =3D va_arg(ap, const char *))) - VIR_TEST_PRELOAD(lib); + VIR_TEST_PRELOAD(lib, true, ap); va_end(ap); =20 progname =3D last_component(argv[0]); diff --git a/tests/testutils.h b/tests/testutils.h index c7f02e4..e4c602b 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -115,12 +115,14 @@ int virTestMain(int argc, return virTestMain(argc, argv, func, NULL); \ } =20 -# define VIR_TEST_PRELOAD(lib) \ +# define VIR_TEST_PRELOAD(lib, haveap, _ap) \ do { \ const char *preload =3D getenv("LD_PRELOAD"); \ if (preload =3D=3D NULL || strstr(preload, lib) =3D=3D NULL) { = \ char *newenv; \ if (!virFileIsExecutable(lib)) { \ + if (haveap) \ + va_end(_ap); \ perror(lib); \ return EXIT_FAILURE; \ } \ @@ -128,6 +130,8 @@ int virTestMain(int argc, newenv =3D (char *) lib; \ } else if (virAsprintf(&newenv, "%s:%s", lib, preload) < 0) { = \ perror("virAsprintf"); \ + if (haveap) \ + va_end(_ap); \ return EXIT_FAILURE; \ } \ setenv("LD_PRELOAD", newenv, 1); \ --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list