turning vcpu manipulation functions xl exit codes toward using the EXIT_[SUCCESS|FAILURE] macros, instead of instead of arbitrary numbers or libxl return codes.
Signed-off-by: Harmandeep Kaur <write.harmand...@gmail.com> --- tools/libxl/xl_cmdimpl.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 718be54..f71a7f0 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5316,7 +5316,7 @@ int main_vcpulist(int argc, char **argv) } vcpulist(argc - optind, argv + optind); - return 0; + return EXIT_SUCCESS; } int main_vcpupin(int argc, char **argv) @@ -5332,7 +5332,7 @@ int main_vcpupin(int argc, char **argv) long vcpuid; const char *vcpu, *hard_str, *soft_str; char *endptr; - int opt, nb_cpu, nb_vcpu, rc = -1; + int opt, nb_cpu, nb_vcpu, rc = EXIT_FAILURE; libxl_bitmap_init(&cpumap_hard); libxl_bitmap_init(&cpumap_soft); @@ -5407,10 +5407,10 @@ int main_vcpupin(int argc, char **argv) if (ferror(stdout) || fflush(stdout)) { perror("stdout"); - exit(-1); + exit(EXIT_FAILURE); } - rc = 0; + rc = EXIT_SUCCESS; goto out; } @@ -5430,7 +5430,7 @@ int main_vcpupin(int argc, char **argv) libxl_vcpuinfo_list_free(vcpuinfo, nb_vcpu); } - rc = 0; + rc = EXIT_SUCCESS; out: libxl_bitmap_dispose(&cpumap_soft); libxl_bitmap_dispose(&cpumap_hard); @@ -5459,8 +5459,7 @@ static int vcpuset(uint32_t domid, const char* nr_vcpus, int check_host) unsigned int host_cpu = libxl_get_max_cpus(ctx); libxl_dominfo dominfo; - rc = libxl_domain_info(ctx, &dominfo, domid); - if (rc) + if (libxl_domain_info(ctx, &dominfo, domid)) return 1; if (max_vcpus > dominfo.vcpu_online && max_vcpus > host_cpu) { @@ -5473,8 +5472,7 @@ static int vcpuset(uint32_t domid, const char* nr_vcpus, int check_host) if (rc) return 1; } - rc = libxl_cpu_bitmap_alloc(ctx, &cpumap, max_vcpus); - if (rc) { + if (libxl_cpu_bitmap_alloc(ctx, &cpumap, max_vcpus)){ fprintf(stderr, "libxl_cpu_bitmap_alloc failed, rc: %d\n", rc); return 1; } @@ -5508,7 +5506,9 @@ int main_vcpuset(int argc, char **argv) break; } - return vcpuset(find_domain(argv[optind]), argv[optind + 1], check_host); + if (vcpuset(find_domain(argv[optind]), argv[optind + 1], check_host)) + return EXIT_FAILURE; + else return EXIT_SUCCESS; } static void output_xeninfo(void) -- 1.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel