From nobody Sat Apr 27 20:25:37 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.zohomail.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 1511544149659126.81091445057928; Fri, 24 Nov 2017 09:22:29 -0800 (PST) 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 723FF7F7A2; Fri, 24 Nov 2017 17:22:28 +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 500D15C7B9; Fri, 24 Nov 2017 17:22:28 +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 0784A1800BDC; Fri, 24 Nov 2017 17:22:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vAOHIkGQ019217 for ; Fri, 24 Nov 2017 12:18:46 -0500 Received: by smtp.corp.redhat.com (Postfix) id A9A175D960; Fri, 24 Nov 2017 17:18:46 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-122.phx2.redhat.com [10.3.116.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id 720B75D9C8 for ; Fri, 24 Nov 2017 17:18:46 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Fri, 24 Nov 2017 12:18:40 -0500 Message-Id: <20171124171842.28448-2-jferlan@redhat.com> In-Reply-To: <20171124171842.28448-1-jferlan@redhat.com> References: <20171124171842.28448-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] conf: Clean up virDomainNumaDefNodeDistanceParseXML 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.28]); Fri, 24 Nov 2017 17:22:28 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Clean up the style a bit w/r/t to not using a unary operator on an integer value that could be zero - compare vs. zero instead. Set the def->mem_nodes[*].distances to rdist or ldist inside the if condition - no need to set outside since the value being set to is what was fetched. During cleanup, be sure to initialize the ndistances on error and use the < 0 comparison not the unary one. Signed-off-by: John Ferlan --- src/conf/numa_conf.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 8fc3b0a196..3aae705a5d 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -714,7 +714,7 @@ virDomainNumaDefNodeDistanceParseXML(virDomainNumaPtr d= ef, xmlNodePtr *nodes =3D NULL; size_t i, ndistances =3D def->nmem_nodes; =20 - if (!ndistances) + if (ndistances =3D=3D 0) return 0; =20 /* check if NUMA distances definition is present */ @@ -805,11 +805,11 @@ virDomainNumaDefNodeDistanceParseXML(virDomainNumaPtr= def, ldist[cur_cell].value =3D LOCAL_DISTANCE; ldist[cur_cell].cellid =3D cur_cell; def->mem_nodes[cur_cell].ndistances =3D ndistances; + def->mem_nodes[cur_cell].distances =3D ldist; } =20 ldist[sibling_id].cellid =3D sibling_id; ldist[sibling_id].value =3D sibling_value; - def->mem_nodes[cur_cell].distances =3D ldist; =20 /* Apply symmetry if none given */ rdist =3D def->mem_nodes[sibling_id].distances; @@ -820,20 +820,21 @@ virDomainNumaDefNodeDistanceParseXML(virDomainNumaPtr= def, rdist[sibling_id].value =3D LOCAL_DISTANCE; rdist[sibling_id].cellid =3D sibling_id; def->mem_nodes[sibling_id].ndistances =3D ndistances; + def->mem_nodes[sibling_id].distances =3D rdist; } =20 rdist[cur_cell].cellid =3D cur_cell; if (!rdist[cur_cell].value) rdist[cur_cell].value =3D sibling_value; - def->mem_nodes[sibling_id].distances =3D rdist; } =20 ret =3D 0; =20 cleanup: - if (ret) { + if (ret < 0) { for (i =3D 0; i < ndistances; i++) VIR_FREE(def->mem_nodes[i].distances); + def->mem_nodes[i].ndistances =3D 0; } VIR_FREE(nodes); VIR_FREE(tmp); --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 27 20:25:37 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.zohomail.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 1511543938926249.34510343624163; Fri, 24 Nov 2017 09:18:58 -0800 (PST) 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 A81205FD4E; Fri, 24 Nov 2017 17:18:57 +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 7D6DC5E1C2; Fri, 24 Nov 2017 17:18:57 +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 422304A468; Fri, 24 Nov 2017 17:18:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vAOHIlDr019222 for ; Fri, 24 Nov 2017 12:18:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0FE205D9C8; Fri, 24 Nov 2017 17:18:47 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-122.phx2.redhat.com [10.3.116.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD0055D960 for ; Fri, 24 Nov 2017 17:18:46 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Fri, 24 Nov 2017 12:18:41 -0500 Message-Id: <20171124171842.28448-3-jferlan@redhat.com> In-Reply-To: <20171124171842.28448-1-jferlan@redhat.com> References: <20171124171842.28448-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] conf: Clean up virDomainNumaDefCPUFormatXML 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]); Fri, 24 Nov 2017 17:18:58 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Don't use a unary comparison for an int value - compare against zero directly instead. Signed-off-by: John Ferlan --- src/conf/numa_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 3aae705a5d..eadf8f2282 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -992,7 +992,7 @@ virDomainNumaDefCPUFormatXML(virBufferPtr buf, virDomainMemoryAccessTypeToString(memAccess)= ); =20 ndistances =3D def->mem_nodes[i].ndistances; - if (!ndistances) { + if (ndistances =3D=3D 0) { virBufferAddLit(buf, "/>\n"); } else { size_t j; --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 27 20:25:37 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.zohomail.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 1511543942061366.8701957309472; Fri, 24 Nov 2017 09:19:02 -0800 (PST) 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 CA3491A406C; Fri, 24 Nov 2017 17:19:00 +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 A2DAF5D960; Fri, 24 Nov 2017 17:19:00 +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 6E4B81800BDE; Fri, 24 Nov 2017 17:19:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vAOHIl0F019227 for ; Fri, 24 Nov 2017 12:18:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6DA9D5D9C8; Fri, 24 Nov 2017 17:18:47 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-122.phx2.redhat.com [10.3.116.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35DC55D960 for ; Fri, 24 Nov 2017 17:18:47 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Fri, 24 Nov 2017 12:18:42 -0500 Message-Id: <20171124171842.28448-4-jferlan@redhat.com> In-Reply-To: <20171124171842.28448-1-jferlan@redhat.com> References: <20171124171842.28448-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/3] conf: Fix memory leak for distances in virDomainNumaFree 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]); Fri, 24 Nov 2017 17:19:01 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Commit id '74119a03f' neglected to clean up @distances when the numa definition is cleaned up. Signed-off-by: John Ferlan --- src/conf/numa_conf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index eadf8f2282..c906a53de0 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -362,6 +362,9 @@ virDomainNumaFree(virDomainNumaPtr numa) for (i =3D 0; i < numa->nmem_nodes; i++) { virBitmapFree(numa->mem_nodes[i].cpumask); virBitmapFree(numa->mem_nodes[i].nodeset); + + if (numa->mem_nodes[i].ndistances > 0) + VIR_FREE(numa->mem_nodes[i].distances); } VIR_FREE(numa->mem_nodes); =20 --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list