From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH 9/9] xl: use libxl_cpupoolinfo_list_free() in main_cpupoolnumasplit Date: Wed, 11 Mar 2015 14:54:43 +0000 Message-ID: <1426085683.21353.256.camel@citrix.com> References: <20150306170758.7269.53821.stgit@Solace.station> <20150306172207.7269.13948.stgit@Solace.station> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20150306172207.7269.13948.stgit@Solace.station> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Dario Faggioli Cc: Juergen Gross , Ian Jackson , Stefano Stabellini , Wei Liu , Xen-devel List-Id: xen-devel@lists.xenproject.org On Fri, 2015-03-06 at 18:22 +0100, Dario Faggioli wrote: > instead manually free the elements of the list, which is ^of freeing > exactly the purpose of the said function. > > Trade also a couple of 'return'-s with 'goto out'-s, which > is more in line with libxl usage paradigm. > > Signed-off-by: Dario Faggioli > Cc: Ian Campbell > Cc: Ian Jackson > Cc: Stefano Stabellini > Cc: Wei Liu > Cc: Juergen Gross > --- > tools/libxl/xl_cmdimpl.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c > index 14b5a3d..ec2b6a9 100644 > --- a/tools/libxl/xl_cmdimpl.c > +++ b/tools/libxl/xl_cmdimpl.c > @@ -7477,9 +7477,8 @@ int main_cpupoolnumasplit(int argc, char **argv) > } > poolid = poolinfo[0].poolid; > sched = poolinfo[0].sched; > - for (p = 0; p < n_pools; p++) { > - libxl_cpupoolinfo_dispose(poolinfo + p); > - } > + libxl_cpupoolinfo_list_free(poolinfo, n_pools); > + > if (n_pools > 1) { > fprintf(stderr, "splitting not possible, already cpupools in use\n"); > return 1; > @@ -7493,8 +7492,7 @@ int main_cpupoolnumasplit(int argc, char **argv) > > if (libxl_cpu_bitmap_alloc(ctx, &cpumap, 0)) { > fprintf(stderr, "Failed to allocate cpumap\n"); > - libxl_cputopology_list_free(topology, n_cpus); > - return 1; > + goto out; > } > > /* Reset Pool-0 to 1st node: first add cpus, then remove cpus to avoid > @@ -7503,7 +7501,7 @@ int main_cpupoolnumasplit(int argc, char **argv) > node = topology[0].node; > if (libxl_cpupool_cpuadd_node(ctx, 0, node, &n)) { > fprintf(stderr, "error on adding cpu to Pool 0\n"); > - return 1; > + goto out; > } > > snprintf(name, 15, "Pool-node%d", node); > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel