From patchwork Fri Dec 18 12:23:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Dunlap X-Patchwork-Id: 7882801 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id ADF109F3CD for ; Fri, 18 Dec 2015 12:26:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D27B020429 for ; Fri, 18 Dec 2015 12:26:27 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DCE8D204A2 for ; Fri, 18 Dec 2015 12:26:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9u4w-0005V9-Qq; Fri, 18 Dec 2015 12:24:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9u4v-0005UN-95 for xen-devel@lists.xen.org; Fri, 18 Dec 2015 12:24:09 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id AD/FC-18316-8EAF3765; Fri, 18 Dec 2015 12:24:08 +0000 X-Env-Sender: prvs=787e22e97=George.Dunlap@citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1450441435!6080398!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2705 invoked from network); 18 Dec 2015 12:24:06 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 18 Dec 2015 12:24:06 -0000 X-IronPort-AV: E=Sophos;i="5.20,446,1444694400"; d="scan'208";a="326245103" From: George Dunlap To: Date: Fri, 18 Dec 2015 12:23:43 +0000 Message-ID: <1450441425-10755-4-git-send-email-george.dunlap@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1450441425-10755-1-git-send-email-george.dunlap@eu.citrix.com> References: <1450441425-10755-1-git-send-email-george.dunlap@eu.citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: George Dunlap , Ian Jackson , Wei Liu , Ian Campbell Subject: [Xen-devel] [PATCH v4 3/5] xl: Make set_memory_target return an error code on failure X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Dario Faggioli Acked-by: Ian Jackson --- 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)