From patchwork Mon May 9 11:30:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paulina Szubarczyk X-Patchwork-Id: 9045361 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 4F4519F1C3 for ; Mon, 9 May 2016 11:34:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6245020109 for ; Mon, 9 May 2016 11:34:55 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5751E2008F for ; Mon, 9 May 2016 11:34:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1azjQM-0004xJ-DC; Mon, 09 May 2016 11:32:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1azjQL-0004xD-3p for xen-devel@lists.xenproject.org; Mon, 09 May 2016 11:32:29 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 7B/A9-26485-C4570375; Mon, 09 May 2016 11:32:28 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKIsWRWlGSWpSXmKPExsXiVRvkqOtdahB uMPebqsX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmjHx6Cy2gi1qFa2LDjE1MH6S6WLk5BASmMko 8WB7XhcjFweLwCxWiSNrJrOAOBIC21gltl6fwg5SJSEQIzHv1mqgBAeQXS3xY0EoRLOWxKWVK 8DqhQQmMUlMXT+fGSTBJmAmMXPyTxYQW0RASeLeqslMIEXMAtsZJWafbGEFSQgL2Eh0ntgGZr MIqEpM7PsG1sAr4C2xYMlGVojFchInj01mBVnMKeAjse+pFcRib4kdy/rZIcoFJU7OfAJ2G7O AusT6eUIgYWYBeYnmrbOZJzAKz0JSNQuhahaSqgWMzKsYNYpTi8pSi3QNzfSSijLTM0pyEzNz dA0NTPVyU4uLE9NTcxKTivWS83M3MQKDnAEIdjCeP+15iFGSg0lJlNeVUS9ciC8pP6UyI7E4I 76oNCe1+BCjDAeHkgTv3WKDcCHBotT01Iq0zBxgvMGkJTh4lER4U0HSvMUFibnFmekQqVOMuh xbpt5byyTEkpeflyolznsSpEgApCijNA9uBCz2LzHKSgnzMgIdJcRTkFqUm1mCKv+KUZyDUUm Yl6MEaApPZl4J3KZXQEcwAR0hx6YPckRJIkJKqoGx4o+e8Nm1k7i373oaHXJqv9r2LFHV+3+1 9Vb3LXNZYLKDuWf3CZnVGdLrpj7yUrU7N11IU/hA9aVf99MaLRr/tVgtK1zebZR12JN9i6DO7 YuP3edEFxotnymQZXzbfV2dmtXtX1N/xflUxrjNWn3OIzrT9d7x+ZPkq3z7N3Z5ct9b+XMmc0 2+EktxRqKhFnNRcSIATkujlfgCAAA= X-Env-Sender: paulinaszubarczyk@gmail.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1462793547!34693648!1 X-Originating-IP: [74.125.82.65] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 50928 invoked from network); 9 May 2016 11:32:27 -0000 Received: from mail-wm0-f65.google.com (HELO mail-wm0-f65.google.com) (74.125.82.65) by server-13.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 9 May 2016 11:32:27 -0000 Received: by mail-wm0-f65.google.com with SMTP id w143so20143264wmw.3 for ; Mon, 09 May 2016 04:32:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8BGjLLuXpL4TNvj8rKEromFVOvttbcu0JkrOqvhef/8=; b=ebkOogZj7ml+H4i4JB1cSf9IWcorFTmIDJOoeOSumyYLtOG8AXVeKPx4VYi4/TjoPa 5b0yEZiIvf5OgjVw9T4azJcFU3WgQYN+NCQwhv3+Y0KXHeynQmDCTmEAhFtvPQ+aLvbP 6lDGBsEafCm3mpMBbeF5RgEXLkHPGMGIsfTZSacUXjJ35y2BcwpxEv0G6GBFeDXPTOcn n0p85dbyxoGXJ7LYmzBAZfBIP/VLq3vJOsXaCaVczMnHuUV3yVwGI5ps8Xbu2z7d3n3+ D4yakMkUr7QNmNmhJ16cA4zGqnTtLwXQlcoKV9joMo3xVdXINqWvP5N9cM79WaftC4DQ qbIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8BGjLLuXpL4TNvj8rKEromFVOvttbcu0JkrOqvhef/8=; b=h4MtwYUfBe4H3S8E1SeBQbOAn4hiKd+lakVSC86qCCBB9A9QFKqkF936urum3modMW qQuVX8wyZgL8y2Ky2Ie5OkrpOMicvHIQcc/o+TDqn86+TTemwkCJ0fGcLvztN8gyo8qq VhH3hq7dH4FfZw0zPxN15gWQuEhvI44JAvXakq487UEWd0BbA59SrEb3J6QvF2FzHbko +zh3yP3wr/v73fwMVFc8ok3N62I+n9kYgQ0ZYGk9qBDbAa+jZ9zmk95cjVIGCdN2G3Gu CHhOnclpE3H9kray0Edjlhr+j12sImellS2+ao3ytcQVXT1HtVeyiwySIpNnwk5iLQqo RXWQ== X-Gm-Message-State: AOPr4FWBeLAWLYO7/4yBVpl2VlevQj34fLjNVRLbNd2PCwIGQwNI0mBwOtZGdXzzitQ+oA== X-Received: by 10.28.214.137 with SMTP id n131mr10312844wmg.20.1462793547227; Mon, 09 May 2016 04:32:27 -0700 (PDT) Received: from paulina.fritz.box (p4FDE7A07.dip0.t-ipconnect.de. [79.222.122.7]) by smtp.gmail.com with ESMTPSA id y3sm30631459wji.40.2016.05.09.04.32.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 May 2016 04:32:26 -0700 (PDT) From: Paulina Szubarczyk To: xen-devel@lists.xenproject.org Date: Mon, 9 May 2016 13:30:53 +0200 Message-Id: <1462793458-27170-3-git-send-email-paulinaszubarczyk@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462793458-27170-1-git-send-email-paulinaszubarczyk@gmail.com> References: <1462793458-27170-1-git-send-email-paulinaszubarczyk@gmail.com> MIME-Version: 1.0 Cc: wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, Paulina Szubarczyk , dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v4 2/7] xl: improve main_tmem_* return codes X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, 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 Functions libxl_tmem_freeze(), libxl_tmem_thaw(), libxl_tmem_set() and libxl_tmem_shared_auth() located in libxl.c file return ERROR_FAIL/ERROR_INVAL or internal error codes from libxc library improve main_tmem_* return codes by returning EXIT_{SUCCESS/FAILURE} accordingly to return codes of those functions. Signed-off-by: Paulina Szubarczyk Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Dario Faggioli Acked-by: Roger Pau Monné Acked-by: Wei Liu --- tools/libxl/xl_cmdimpl.c | 51 ++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 0e5826b..aedf613 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7821,11 +7821,11 @@ int main_tmem_list(int argc, char **argv) buf = libxl_tmem_list(ctx, domid, use_long); if (buf == NULL) - return -1; + return EXIT_FAILURE; printf("%s\n", buf); free(buf); - return 0; + return EXIT_SUCCESS; } int main_tmem_freeze(int argc, char **argv) @@ -7845,7 +7845,7 @@ int main_tmem_freeze(int argc, char **argv) if (!dom && all == 0) { fprintf(stderr, "You must specify -a or a domain id.\n\n"); help("tmem-freeze"); - return 1; + return EXIT_FAILURE; } if (all) @@ -7853,8 +7853,10 @@ int main_tmem_freeze(int argc, char **argv) else domid = find_domain(dom); - libxl_tmem_freeze(ctx, domid); - return 0; + if (libxl_tmem_freeze(ctx, domid) < 0) + return EXIT_FAILURE; + + return EXIT_SUCCESS; } int main_tmem_thaw(int argc, char **argv) @@ -7874,7 +7876,7 @@ int main_tmem_thaw(int argc, char **argv) if (!dom && all == 0) { fprintf(stderr, "You must specify -a or a domain id.\n\n"); help("tmem-thaw"); - return 1; + return EXIT_FAILURE; } if (all) @@ -7882,8 +7884,10 @@ int main_tmem_thaw(int argc, char **argv) else domid = find_domain(dom); - libxl_tmem_thaw(ctx, domid); - return 0; + if (libxl_tmem_thaw(ctx, domid) < 0) + return EXIT_FAILURE; + + return EXIT_SUCCESS; } int main_tmem_set(int argc, char **argv) @@ -7894,6 +7898,7 @@ int main_tmem_set(int argc, char **argv) int opt_w = 0, opt_c = 0, opt_p = 0; int all = 0; int opt; + int rc = 0; SWITCH_FOREACH_OPT(opt, "aw:c:p:", NULL, "tmem-set", 0) { case 'a': @@ -7917,7 +7922,7 @@ int main_tmem_set(int argc, char **argv) if (!dom && all == 0) { fprintf(stderr, "You must specify -a or a domain id.\n\n"); help("tmem-set"); - return 1; + return EXIT_FAILURE; } if (all) @@ -7928,17 +7933,20 @@ int main_tmem_set(int argc, char **argv) if (!opt_w && !opt_c && !opt_p) { fprintf(stderr, "No set value specified.\n\n"); help("tmem-set"); - return 1; + return EXIT_FAILURE; } if (opt_w) - libxl_tmem_set(ctx, domid, "weight", weight); + rc = libxl_tmem_set(ctx, domid, "weight", weight); if (opt_c) - libxl_tmem_set(ctx, domid, "cap", cap); + rc = libxl_tmem_set(ctx, domid, "cap", cap); if (opt_p) - libxl_tmem_set(ctx, domid, "compress", compress); + rc = libxl_tmem_set(ctx, domid, "compress", compress); - return 0; + if (rc < 0) + return EXIT_FAILURE; + + return EXIT_SUCCESS; } int main_tmem_shared_auth(int argc, char **argv) @@ -7968,7 +7976,7 @@ int main_tmem_shared_auth(int argc, char **argv) if (!dom && all == 0) { fprintf(stderr, "You must specify -a or a domain id.\n\n"); help("tmem-shared-auth"); - return 1; + return EXIT_FAILURE; } if (all) @@ -7979,18 +7987,19 @@ int main_tmem_shared_auth(int argc, char **argv) if (uuid == NULL || autharg == NULL) { fprintf(stderr, "No uuid or auth specified.\n\n"); help("tmem-shared-auth"); - return 1; + return EXIT_FAILURE; } auth = strtol(autharg, &endptr, 10); if (*endptr != '\0') { fprintf(stderr, "Invalid auth, valid auth are <0|1>.\n\n"); - return 1; + return EXIT_FAILURE; } - libxl_tmem_shared_auth(ctx, domid, uuid, auth); + if (libxl_tmem_shared_auth(ctx, domid, uuid, auth) < 0) + return EXIT_FAILURE; - return 0; + return EXIT_SUCCESS; } int main_tmem_freeable(int argc, char **argv) @@ -8004,10 +8013,10 @@ int main_tmem_freeable(int argc, char **argv) mb = libxl_tmem_freeable(ctx); if (mb == -1) - return -1; + return EXIT_FAILURE; printf("%d\n", mb); - return 0; + return EXIT_SUCCESS; } int main_cpupoolcreate(int argc, char **argv)