From nobody Tue Apr 16 20:51:10 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; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1560224076; cv=none; d=zoho.com; s=zohoarc; b=Rnu1w76SCaR+YnIVJShL7AN/gPB1855tgw5IKcT+G96WL9feS2QaO41Q8/LU6ETL3DfK8K/E0ENcfU+iVCgSmfpGfkTpO7LRn0PhNjDBlwki+Eq8OFupAoso439Js88CGtsTHzh4Gy1PMqO9/QbHg8YYJA2J58R8/E9JzUxHIz8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560224076; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=MKW8CL0mRbkWS2rgpx+J75t3IXK8djd0zRs8COkKbWE=; b=VnzfJaHhJ3IqfX+C8XU9whDFoSqC+wjCN9KFc+NVZaHYgYj3DU+dOfGXVZi+Ll00D3kmwoKp5aBKaNzmH52iaOb67vxjFKDGGvz1E937crFlmM1MCoZz2vZVY6tcW+kZIRaKBd15lYmU5aC0v1AZz3+v1H+PZ+jFsiwtskVtsdM= ARC-Authentication-Results: i=1; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1560224076556769.3379033769212; Mon, 10 Jun 2019 20:34:36 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C03D83001824; Tue, 11 Jun 2019 03:34:34 +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 8B3FB19C70; Tue, 11 Jun 2019 03:34:34 +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 2E4F3206D3; Tue, 11 Jun 2019 03:34:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5B3Xjps022178 for ; Mon, 10 Jun 2019 23:33:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id B6FF91001DD1; Tue, 11 Jun 2019 03:33:45 +0000 (UTC) Received: from mx1.redhat.com (ext-mx19.extmail.prod.ext.phx2.redhat.com [10.5.110.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AFCE81001DCC for ; Tue, 11 Jun 2019 03:33:45 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 156D5307D90D for ; Tue, 11 Jun 2019 03:33:45 +0000 (UTC) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jun 2019 20:33:44 -0700 Received: from david-unc.bj.intel.com ([10.238.145.63]) by fmsmga001.fm.intel.com with ESMTP; 10 Jun 2019 20:33:43 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 From: Wang Huaqiang To: libvir-list@redhat.com Date: Tue, 11 Jun 2019 11:31:12 +0800 Message-Id: <1560223876-28816-8-git-send-email-huaqiang.wang@intel.com> In-Reply-To: <1560223876-28816-1-git-send-email-huaqiang.wang@intel.com> References: <1560223876-28816-1-git-send-email-huaqiang.wang@intel.com> X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 216 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 11 Jun 2019 03:33:45 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 11 Jun 2019 03:33:45 +0000 (UTC) for IP:'134.134.136.31' DOMAIN:'mga06.intel.com' HELO:'mga06.intel.com' FROM:'huaqiang.wang@intel.com' RCPT:'' X-RedHat-Spam-Score: -2.3 (RCVD_IN_DNSWL_MED, SPF_HELO_NONE, SPF_PASS) 134.134.136.31 mga06.intel.com 134.134.136.31 mga06.intel.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.48 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: huaqiang.wang@intel.com, tao.su@intel.com Subject: [libvirt] [PATCHv2 07/11] util: Refactor and rename 'virResctrlMonitorFreeStats' 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.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Tue, 11 Jun 2019 03:34:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Refactor and rename 'virResctrlMonitorFreeStats' to 'virResctrlMonitorStatsFree' to free one 'virResctrlMonitorStatsPtr' object. Signed-off-by: Wang Huaqiang --- src/libvirt_private.syms | 2 +- src/qemu/qemu_driver.c | 6 +++++- src/util/virresctrl.c | 14 ++++---------- src/util/virresctrl.h | 4 ++-- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b95f958..1d949b3 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2769,13 +2769,13 @@ virResctrlInfoNew; virResctrlMonitorAddPID; virResctrlMonitorCreate; virResctrlMonitorDeterminePath; -virResctrlMonitorFreeStats; virResctrlMonitorGetCacheOccupancy; virResctrlMonitorGetID; virResctrlMonitorNew; virResctrlMonitorRemove; virResctrlMonitorSetAlloc; virResctrlMonitorSetID; +virResctrlMonitorStatsFree; =20 =20 # util/virrotatingfile.h diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 42b1ce2..85fbe21 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19977,9 +19977,13 @@ struct _virQEMUResctrlMonData { static void qemuDomainFreeResctrlMonData(virQEMUResctrlMonDataPtr resdata) { + size_t i =3D 0; + VIR_FREE(resdata->name); VIR_FREE(resdata->vcpus); - virResctrlMonitorFreeStats(resdata->stats, resdata->nstats); + for (i =3D 0; i < resdata->nstats; i++) + virResctrlMonitorStatsFree(resdata->stats[i]); + VIR_FREE(resdata->stats); VIR_FREE(resdata); } =20 diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index fb66ea3..af0e5c0 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -2765,25 +2765,19 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr moni= tor, cleanup: VIR_FREE(datapath); VIR_FREE(filepath); - VIR_FREE(stat); + virResctrlMonitorStatsFree(stat); VIR_DIR_CLOSE(dirp); return ret; } =20 =20 void -virResctrlMonitorFreeStats(virResctrlMonitorStatsPtr *stats, - size_t nstats) +virResctrlMonitorStatsFree(virResctrlMonitorStatsPtr stat) { - size_t i =3D 0; - - if (!stats) + if (!stat) return; =20 - for (i =3D 0; i < nstats; i++) - VIR_FREE(stats[i]); - - VIR_FREE(stats); + VIR_FREE(stat); } =20 =20 diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h index abdeb59..d46e533 100644 --- a/src/util/virresctrl.h +++ b/src/util/virresctrl.h @@ -233,6 +233,6 @@ virResctrlMonitorGetCacheOccupancy(virResctrlMonitorPtr= monitor, size_t *nstats); =20 void -virResctrlMonitorFreeStats(virResctrlMonitorStatsPtr *stats, - size_t nstats); +virResctrlMonitorStatsFree(virResctrlMonitorStatsPtr stats); + #endif /* LIBVIRT_VIRRESCTRL_H */ --=20 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list