From: Wei Liu <wei.liu2@citrix.com>
Date: Fri, 17 Jul 2015 17:01:08 +0000 (+0100)
Subject: libxl: call libxl_cpupoolinfo_{init, dispose} in numa_place_domain
X-Git-Tag: 4.6.0-rc1~100
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=deda96fb66a6a3db97a0f99e8c90aacc3c4e6135;p=xen.git

libxl: call libxl_cpupoolinfo_{init, dispose} in numa_place_domain

Call libxl_cpupoolinfo_init at the beginning.  Change two returns to
goto out so that libxl_cpupoolinfo_dispose is called in failure path.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
index 601d5cc7c1..edd7f3f772 100644
--- a/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c
@@ -142,6 +142,7 @@ static int numa_place_domain(libxl__gc *gc, uint32_t domid,
 
     libxl__numa_candidate_init(&candidate);
     libxl_bitmap_init(&cpupool_nodemap);
+    libxl_cpupoolinfo_init(&cpupool_info);
 
     /*
      * Extract the cpumap from the cpupool the domain belong to. In fact,
@@ -150,10 +151,10 @@ static int numa_place_domain(libxl__gc *gc, uint32_t domid,
      */
     rc = cpupool = libxl__domain_cpupool(gc, domid);
     if (rc < 0)
-        return rc;
+        goto out;
     rc = libxl_cpupool_info(CTX, &cpupool_info, cpupool);
     if (rc)
-        return rc;
+        goto out;
 
     rc = libxl_domain_need_memory(CTX, info, &memkb);
     if (rc)