From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Wei Liu <wei.liu2@citrix.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>,
Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH v4 3/3] libxl: call libxl_cpupoolinfo_{init, dispose} in numa_place_domain
Date: Fri, 17 Jul 2015 18:01:08 +0100 [thread overview]
Message-ID: <1437152468-20076-4-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1437152468-20076-1-git-send-email-wei.liu2@citrix.com>
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>
---
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
next prev parent reply other threads:[~2015-07-17 17:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-17 17:01 [PATCH v4 0/3] xl/libxl: fix some issues discovered by coverity Wei Liu
2015-07-17 17:01 ` [PATCH v4 1/3] libxl: make libxl__strdup and libxl__strndup handle NULL Wei Liu
2015-07-17 17:03 ` Ian Jackson
2015-07-21 14:50 ` Ian Campbell
2015-07-17 17:01 ` [PATCH v4 2/3] libxl: localtime(3) can return NULL Wei Liu
2015-07-17 17:05 ` Ian Jackson
2015-07-17 17:12 ` Wei Liu
2015-07-22 14:19 ` Ian Campbell
2015-07-22 15:09 ` Wei Liu
2015-07-22 15:13 ` Ian Campbell
2015-07-17 17:01 ` Wei Liu [this message]
2015-07-17 17:03 ` [PATCH v4 3/3] libxl: call libxl_cpupoolinfo_{init, dispose} in numa_place_domain Ian Jackson
2015-07-21 14:50 ` Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437152468-20076-4-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=ian.campbell@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).