From mboxrd@z Thu Jan 1 00:00:00 1970 From: George Dunlap Subject: [PATCH v3 3/6] xl: Make set_memory_target return an error code on failure Date: Tue, 1 Dec 2015 11:53:52 +0000 Message-ID: <1448970835-2706-3-git-send-email-george.dunlap@eu.citrix.com> References: <1448970835-2706-1-git-send-email-george.dunlap@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1448970835-2706-1-git-send-email-george.dunlap@eu.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@lists.xen.org Cc: George Dunlap , Ian Jackson , Wei Liu , Ian Campbell List-Id: xen-devel@lists.xenproject.org Bring set_memory_target into line with set_memory_max (which does return an error code. Signed-off-by: George Dunlap --- CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Konrad Wilk --- tools/libxl/xl_cmdimpl.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 2ba2393..4455d73 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3297,9 +3297,10 @@ int main_memmax(int argc, char **argv) return 0; } -static void set_memory_target(uint32_t domid, const char *mem) +static int set_memory_target(uint32_t domid, const char *mem) { - long long int memorykb; + int64_t memorykb; + int rc; memorykb = parse_mem_size_kb(mem); if (memorykb == -1) { @@ -3307,7 +3308,9 @@ static void set_memory_target(uint32_t domid, const char *mem) exit(3); } - libxl_set_memory_target(ctx, domid, memorykb, 0, /* enforce */ 1); + rc = libxl_set_memory_target(ctx, domid, memorykb, 0, /* enforce */ 1); + + return rc; } int main_memset(int argc, char **argv) @@ -3315,6 +3318,7 @@ int main_memset(int argc, char **argv) uint32_t domid; int opt = 0; const char *mem; + int rc; SWITCH_FOREACH_OPT(opt, "", NULL, "mem-set", 2) { /* No options */ @@ -3323,7 +3327,12 @@ int main_memset(int argc, char **argv) domid = find_domain(argv[optind]); mem = argv[optind + 1]; - set_memory_target(domid, mem); + rc = set_memory_target(domid, mem); + if (rc) { + fprintf(stderr, "cannot set domid %d dynamic max memory to : %s\n", domid, mem); + return 1; + } + return 0; } -- 2.1.4