From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v4 3/3] libxl: call libxl_cpupoolinfo_{init, dispose} in numa_place_domain Date: Fri, 17 Jul 2015 18:01:08 +0100 Message-ID: <1437152468-20076-4-git-send-email-wei.liu2@citrix.com> References: <1437152468-20076-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZG915-0001CB-KI for xen-devel@lists.xenproject.org; Fri, 17 Jul 2015 17:01:43 +0000 In-Reply-To: <1437152468-20076-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Wei Liu , Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org 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 --- tools/libxl/libxl_dom.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 4cb247a..35eadc2 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) -- 1.9.1