From mboxrd@z Thu Jan 1 00:00:00 1970 From: Harmandeep Kaur Subject: [PATCH v3 3/5] xl: improve return and exit codes of vcpu related functions Date: Tue, 27 Oct 2015 15:20:50 +0530 Message-ID: <1445939452-8091-4-git-send-email-write.harmandeep@gmail.com> References: <1445939452-8091-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.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zr0vP-0006z7-BY for xen-devel@lists.xenproject.org; Tue, 27 Oct 2015 09:52:15 +0000 Received: by padda3 with SMTP id da3so24322682pad.1 for ; Tue, 27 Oct 2015 02:52:12 -0700 (PDT) In-Reply-To: <1445939452-8091-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 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 --- v2->v3: Fixed return of main_vcpuset. tools/libxl/xl_cmdimpl.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index b101aff..1dae28f 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,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) -- 1.9.1