From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dario Faggioli Subject: [PATCH v5 02/17] libxl: better name for last parameter of libxl_list_vcpu Date: Mon, 02 Dec 2013 19:27:33 +0100 Message-ID: <20131202182733.29026.58191.stgit@Solace> References: <20131202180129.29026.81543.stgit@Solace> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20131202180129.29026.81543.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: Marcus Granado , Keir Fraser , Ian Campbell , Li Yechen , George Dunlap , Andrew Cooper , Juergen Gross , Ian Jackson , Jan Beulich , Justin Weaver , Matt Wilson , Elena Ufimtseva List-Id: xen-devel@lists.xenproject.org as it is now called `nr_vcpus_out', but what is returned there is the number of pCPUs, rather than the number of vCPUs (which is also returned, but in another parameter, `nb_vcpu'). Signed-off-by: Dario Faggioli --- Changes from v4: * new patch. --- tools/libxl/libxl.c | 4 ++-- tools/libxl/libxl.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a57d571..0cb7ca9 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 *nb_vcpu, int *nr_cpus_out) { libxl_vcpuinfo *ptr, *ret; xc_domaininfo_t domaininfo; @@ -4535,7 +4535,7 @@ 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; diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index a9663e4..bf311fe 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -744,7 +744,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);