From mboxrd@z Thu Jan 1 00:00:00 1970 From: George Dunlap Subject: [PATCH v4 3/5] xl: Make set_memory_target return an error code on failure Date: Fri, 18 Dec 2015 12:23:43 +0000 Message-ID: <1450441425-10755-4-git-send-email-george.dunlap@eu.citrix.com> References: <1450441425-10755-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: <1450441425-10755-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 Also move the rc -> shell code translation into set_memory_max() to make the two functions consistent with each other, and with other similar examples in xl_cmdimpl.c Change a 'long long' to "int64_t" while we're at it. Signed-off-by: George Dunlap --- v4: - Move rc -> shell return code translation into set_memory_{max,target} - Use EXIT_{SUCCESS,FAILURE} rather than magic constants - Note incidental type change in changelog CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Konrad Wilk --- tools/libxl/xl_cmdimpl.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index f9933cb..1a8b4a1 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3265,7 +3265,6 @@ static int def_getopt(int argc, char * const argv[], static int set_memory_max(uint32_t domid, const char *mem) { int64_t memorykb; - int rc; memorykb = parse_mem_size_kb(mem); if (memorykb == -1) { @@ -3273,9 +3272,12 @@ static int set_memory_max(uint32_t domid, const char *mem) exit(3); } - rc = libxl_domain_setmaxmem(ctx, domid, memorykb); + if (libxl_domain_setmaxmem(ctx, domid, memorykb)) { + fprintf(stderr, "cannot set domid %d static max memory to : %s\n", domid, mem); + return EXIT_FAILURE; + } - return rc; + return EXIT_SUCCESS; } int main_memmax(int argc, char **argv) @@ -3283,7 +3285,6 @@ int main_memmax(int argc, char **argv) uint32_t domid; int opt = 0; char *mem; - int rc; SWITCH_FOREACH_OPT(opt, "", NULL, "mem-max", 2) { /* No options */ @@ -3292,18 +3293,12 @@ int main_memmax(int argc, char **argv) domid = find_domain(argv[optind]); mem = argv[optind + 1]; - rc = set_memory_max(domid, mem); - if (rc) { - fprintf(stderr, "cannot set domid %d static max memory to : %s\n", domid, mem); - return 1; - } - - return 0; + return set_memory_max(domid, mem); } -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; memorykb = parse_mem_size_kb(mem); if (memorykb == -1) { @@ -3311,7 +3306,12 @@ static void set_memory_target(uint32_t domid, const char *mem) exit(3); } - libxl_set_memory_target(ctx, domid, memorykb, 0, /* enforce */ 1); + if (libxl_set_memory_target(ctx, domid, memorykb, 0, /* enforce */ 1)) { + fprintf(stderr, "cannot set domid %d dynamic max memory to : %s\n", domid, mem); + return EXIT_FAILURE; + } + + return EXIT_SUCCESS; } int main_memset(int argc, char **argv) @@ -3327,8 +3327,7 @@ int main_memset(int argc, char **argv) domid = find_domain(argv[optind]); mem = argv[optind + 1]; - set_memory_target(domid, mem); - return 0; + return set_memory_target(domid, mem); } static int cd_insert(uint32_t domid, const char *virtdev, char *phys) -- 2.1.4