From mboxrd@z Thu Jan 1 00:00:00 1970 From: Harmandeep Kaur Subject: [PATCH 3/3] xl: convert cpupool related return codes to EXIT_[SUCCESS|FAILURE] Date: Fri, 23 Oct 2015 13:18:11 +0530 Message-ID: <1445586491-15093-3-git-send-email-write.harmandeep@gmail.com> References: <1445586491-15093-1-git-send-email-write.harmandeep@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZpX6m-00085k-6M for xen-devel@lists.xenproject.org; Fri, 23 Oct 2015 07:49:52 +0000 Received: by wibvt6 with SMTP id vt6so3269338wib.3 for ; Fri, 23 Oct 2015 00:49:50 -0700 (PDT) In-Reply-To: <1445586491-15093-1-git-send-email-write.harmandeep@gmail.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.xenproject.org Cc: stefano.stebellini@eu.citrix.com, wei.liu2@citrix.com, ian.campbell@citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, george.dunlap@citrix.com, Harmandeep Kaur List-Id: xen-devel@lists.xenproject.org turning cpupools related functions xl exit codes towards using the EXIT_[SUCCESS|FAILURE] macros, instead of instead of arbitrary numbers or libxl return codes. Signed-off-by: Harmandeep Kaur --- tools/libxl/xl_cmdimpl.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 2cb4fe8..c7009cf 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7497,7 +7497,7 @@ out: free(name); free(config_data); free(extra_config); - return rc; + return rc ? EXIT_FAILURE : EXIT_SUCCESS; } int main_cpupoollist(int argc, char **argv) @@ -7524,14 +7524,14 @@ int main_cpupoollist(int argc, char **argv) pool = argv[optind]; if (libxl_name_to_cpupoolid(ctx, pool, &poolid)) { fprintf(stderr, "Pool \'%s\' does not exist\n", pool); - return 1; + return EXIT_FAILURE; } } poolinfo = libxl_list_cpupool(ctx, &n_pools); if (!poolinfo) { fprintf(stderr, "error getting cpupool info\n"); - return 1; + return EXIT_FAILURE; } printf("%-19s", "Name"); @@ -7562,7 +7562,7 @@ int main_cpupoollist(int argc, char **argv) libxl_cpupoolinfo_list_free(poolinfo, n_pools); - return 0; + return EXIT_SUCCESS; } int main_cpupooldestroy(int argc, char **argv) @@ -7580,13 +7580,13 @@ int main_cpupooldestroy(int argc, char **argv) if (libxl_cpupool_qualifier_to_cpupoolid(ctx, pool, &poolid, NULL) || !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool '%s'\n", pool); - return 1; + return EXIT_FAILURE; } if (libxl_cpupool_destroy(ctx, poolid)) - return 1; + return EXIT_FAILURE; - return 0; + return EXIT_SUCCESS; } int main_cpupoolrename(int argc, char **argv) @@ -7605,17 +7605,17 @@ int main_cpupoolrename(int argc, char **argv) if (libxl_cpupool_qualifier_to_cpupoolid(ctx, pool, &poolid, NULL) || !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool '%s'\n", pool); - return 1; + return EXIT_FAILURE; } new_name = argv[optind]; if (libxl_cpupool_rename(ctx, new_name, poolid)) { fprintf(stderr, "Can't rename cpupool '%s'\n", pool); - return 1; + return EXIT_FAILURE; } - return 0; + return EXIT_SUCCESS; } int main_cpupoolcpuadd(int argc, char **argv) @@ -7633,7 +7633,7 @@ int main_cpupoolcpuadd(int argc, char **argv) libxl_bitmap_init(&cpumap); if (libxl_cpu_bitmap_alloc(ctx, &cpumap, 0)) { fprintf(stderr, "Unable to allocate cpumap"); - return 1; + return EXIT_FAILURE; } pool = argv[optind++]; @@ -7653,7 +7653,7 @@ int main_cpupoolcpuadd(int argc, char **argv) out: libxl_bitmap_dispose(&cpumap); - return rc; + return rc ? EXIT_FAILURE : EXIT_SUCCESS; } int main_cpupoolcpuremove(int argc, char **argv) @@ -7667,7 +7667,7 @@ int main_cpupoolcpuremove(int argc, char **argv) libxl_bitmap_init(&cpumap); if (libxl_cpu_bitmap_alloc(ctx, &cpumap, 0)) { fprintf(stderr, "Unable to allocate cpumap"); - return 1; + return EXIT_FAILURE; } SWITCH_FOREACH_OPT(opt, "", NULL, "cpupool-cpu-remove", 2) { @@ -7691,7 +7691,7 @@ int main_cpupoolcpuremove(int argc, char **argv) out: libxl_bitmap_dispose(&cpumap); - return rc; + return rc ? EXIT_FAILURE : EXIT_SUCCESS; } int main_cpupoolmigrate(int argc, char **argv) @@ -7712,19 +7712,19 @@ int main_cpupoolmigrate(int argc, char **argv) if (libxl_domain_qualifier_to_domid(ctx, dom, &domid) || !libxl_domid_to_name(ctx, domid)) { fprintf(stderr, "unknown domain '%s'\n", dom); - return 1; + return EXIT_FAILURE; } if (libxl_cpupool_qualifier_to_cpupoolid(ctx, pool, &poolid, NULL) || !libxl_cpupoolid_is_valid(ctx, poolid)) { fprintf(stderr, "unknown cpupool '%s'\n", pool); - return 1; + return EXIT_FAILURE; } if (libxl_cpupool_movedomain(ctx, poolid, domid)) - return 1; + return EXIT_FAILURE; - return 0; + return EXIT_SUCCESS; } int main_cpupoolnumasplit(int argc, char **argv) @@ -7758,7 +7758,7 @@ int main_cpupoolnumasplit(int argc, char **argv) poolinfo = libxl_list_cpupool(ctx, &n_pools); if (!poolinfo) { fprintf(stderr, "error getting cpupool info\n"); - return 1; + return EXIT_FAILURE; } poolid = poolinfo[0].poolid; sched = poolinfo[0].sched; @@ -7766,13 +7766,13 @@ int main_cpupoolnumasplit(int argc, char **argv) if (n_pools > 1) { fprintf(stderr, "splitting not possible, already cpupools in use\n"); - return 1; + return EXIT_FAILURE; } topology = libxl_get_cpu_topology(ctx, &n_cpus); if (topology == NULL) { fprintf(stderr, "libxl_get_topologyinfo failed\n"); - return 1; + return EXIT_FAILURE; } if (libxl_cpu_bitmap_alloc(ctx, &cpumap, 0)) { @@ -7869,7 +7869,7 @@ out: libxl_dominfo_dispose(&info); free(name); - return rc; + return rc ? EXIT_FAILURE : EXIT_SUCCESS; } int main_getenforce(int argc, char **argv) -- 1.9.1