From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dario Faggioli Subject: [RESEND PATCH v5 2/9] libxl: better name for parameters in libxl_list_vcpu Date: Sat, 07 Dec 2013 01:04:40 +0100 Message-ID: <20131207000440.22982.34443.stgit@Solace> References: <20131206233642.22982.76947.stgit@Solace> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20131206233642.22982.76947.stgit@Solace> 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.xen.org Cc: George Dunlap , Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org so that the parameter that returns the number of pCPUs is called nr_cpus_out, while the one that returns the number of vCPUs is called nr_vcpus_out. The patch is all about renaming, so no functional change. Signed-off-by: Dario Faggioli Acked-by: Ian Jackson --- Changes from v5: * renaming also nb_vcpu to nr_vcpus_out Changes from v4: * new patch. --- tools/libxl/libxl.c | 15 +++++++++------ tools/libxl/libxl.h | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 771b45b..108da30 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4525,7 +4525,7 @@ const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx) } libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, - int *nb_vcpu, int *nr_vcpus_out) + int *nr_vcpus_out, int *nr_cpus_out) { libxl_vcpuinfo *ptr, *ret; xc_domaininfo_t domaininfo; @@ -4535,26 +4535,29 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting infolist"); return NULL; } - *nr_vcpus_out = libxl_get_max_cpus(ctx); + *nr_cpus_out = libxl_get_max_cpus(ctx); ret = ptr = calloc(domaininfo.max_vcpu_id + 1, sizeof (libxl_vcpuinfo)); if (!ptr) { return NULL; } - for (*nb_vcpu = 0; *nb_vcpu <= domaininfo.max_vcpu_id; ++*nb_vcpu, ++ptr) { + for (*nr_vcpus_out = 0; + *nr_vcpus_out <= domaininfo.max_vcpu_id; + ++*nr_vcpus_out, ++ptr) { if (libxl_cpu_bitmap_alloc(ctx, &ptr->cpumap, 0)) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "allocating cpumap"); goto err; } - if (xc_vcpu_getinfo(ctx->xch, domid, *nb_vcpu, &vcpuinfo) == -1) { + if (xc_vcpu_getinfo(ctx->xch, domid, *nr_vcpus_out, &vcpuinfo) == -1) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting vcpu info"); goto err; } - if (xc_vcpu_getaffinity(ctx->xch, domid, *nb_vcpu, ptr->cpumap.map) == -1) { + if (xc_vcpu_getaffinity(ctx->xch, domid, *nr_vcpus_out, + ptr->cpumap.map) == -1) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting vcpu affinity"); goto err; } - ptr->vcpuid = *nb_vcpu; + ptr->vcpuid = *nr_vcpus_out; ptr->cpu = vcpuinfo.cpu; ptr->online = !!vcpuinfo.online; ptr->blocked = !!vcpuinfo.blocked; diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 094ddd0..75b64ea 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -769,7 +769,7 @@ libxl_numainfo *libxl_get_numainfo(libxl_ctx *ctx, int *nr); void libxl_numainfo_list_free(libxl_numainfo *, int nr); libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, - int *nb_vcpu, int *nr_vcpus_out); + int *nb_vcpu, int *nr_cpus_out); void libxl_vcpuinfo_list_free(libxl_vcpuinfo *, int nr_vcpus); void libxl_device_vtpm_list_free(libxl_device_vtpm*, int nr_vtpms);