From mboxrd@z Thu Jan 1 00:00:00 1970 From: Harmandeep Kaur Subject: [PATCH v2 4/5] xl: improve return and exit codes of cpupool related functions Date: Sat, 24 Oct 2015 11:01:35 +0530 Message-ID: <1445664696-14258-5-git-send-email-write.harmandeep@gmail.com> References: <1445664696-14258-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 1ZprSN-0007FJ-44 for xen-devel@lists.xenproject.org; Sat, 24 Oct 2015 05:33:31 +0000 Received: by wicuv6 with SMTP id uv6so8975928wic.2 for ; Fri, 23 Oct 2015 22:33:29 -0700 (PDT) In-Reply-To: <1445664696-14258-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: lars.kurth@citrix.com, wei.liu2@citrix.com, ian.campbell@citrix.com, stefano.stabellini@eu.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 | 52 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index f71a7f0..07b2bcd 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7311,7 +7311,7 @@ int main_cpupoolcreate(int argc, char **argv) libxl_bitmap cpumap; libxl_uuid uuid; libxl_cputopology *topology; - int rc = 1; + int rc = EXIT_FAILURE; SWITCH_FOREACH_OPT(opt, "nf:", opts, "cpupool-create", 0) { case 'f': @@ -7481,7 +7481,7 @@ int main_cpupoolcreate(int argc, char **argv) } } /* We made it! */ - rc = 0; + rc = EXIT_SUCCESS; out_cfg: xlu_cfg_destroy(config); @@ -7518,14 +7518,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"); @@ -7556,7 +7556,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) @@ -7574,13 +7574,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) @@ -7599,17 +7599,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) @@ -7618,7 +7618,7 @@ int main_cpupoolcpuadd(int argc, char **argv) const char *pool; uint32_t poolid; libxl_bitmap cpumap; - int rc = 1; + int rc = EXIT_FAILURE; SWITCH_FOREACH_OPT(opt, "", NULL, "cpupool-cpu-add", 2) { /* No options */ @@ -7627,7 +7627,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++]; @@ -7643,7 +7643,7 @@ int main_cpupoolcpuadd(int argc, char **argv) if (libxl_cpupool_cpuadd_cpumap(ctx, poolid, &cpumap)) fprintf(stderr, "some cpus may not have been added to %s\n", pool); - rc = 0; + rc = EXIT_SUCCESS; out: libxl_bitmap_dispose(&cpumap); @@ -7656,12 +7656,12 @@ int main_cpupoolcpuremove(int argc, char **argv) const char *pool; uint32_t poolid; libxl_bitmap cpumap; - int rc = 1; + int rc = EXIT_FAILURE; 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) { @@ -7681,7 +7681,7 @@ int main_cpupoolcpuremove(int argc, char **argv) if (libxl_cpupool_cpuremove_cpumap(ctx, poolid, &cpumap)) fprintf(stderr, "some cpus may not have been removed from %s\n", pool); - rc = 0; + rc = EXIT_SUCCESS; out: libxl_bitmap_dispose(&cpumap); @@ -7706,19 +7706,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) @@ -7746,13 +7746,13 @@ int main_cpupoolnumasplit(int argc, char **argv) libxl_dominfo_init(&info); - rc = 1; + rc = EXIT_FAILURE; libxl_bitmap_init(&cpumap); 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; @@ -7760,13 +7760,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)) { @@ -7855,7 +7855,7 @@ int main_cpupoolnumasplit(int argc, char **argv) } } - rc = 0; + rc = EXIT_SUCCESS; out: libxl_cputopology_list_free(topology, n_cpus); -- 1.9.1