[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen master] xl: improve return and exit codes of vcpu related functions
commit 5b725e56d684ca6a437c9679d53314e9ce9f20d7 Author: Harmandeep Kaur <write.harmandeep@xxxxxxxxx> AuthorDate: Wed Oct 28 07:56:22 2015 +0530 Commit: Ian Campbell <ian.campbell@xxxxxxxxxx> CommitDate: Tue Nov 3 17:03:04 2015 +0000 xl: improve return and exit codes of vcpu related functions Turning vcpu manipulation functions exit codes toward using the EXIT_[SUCCESS|FAILURE] constants, instead of instead of arbitrary numbers or libxl return codes. Signed-off-by: Harmandeep Kaur <write.harmandeep@xxxxxxxxx> Reviewed-by: Dario Faggioli <dario.faggioli@xxxxxxxxxx> Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx> --- tools/libxl/xl_cmdimpl.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index db2d44d..943e45f 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5317,7 +5317,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) @@ -5333,7 +5333,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); @@ -5408,10 +5408,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; } @@ -5431,7 +5431,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); @@ -5460,8 +5460,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) { @@ -5474,8 +5473,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; } @@ -5509,7 +5507,10 @@ 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; + + return EXIT_SUCCESS; } static void output_xeninfo(void) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |