From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: Re: [PATCH] libxl: remove the xl list limit of 1024 domains Date: Mon, 4 Jan 2016 15:35:50 +0100 Message-ID: <568A8346.1080204@suse.com> References: <1450449265-2633-1-git-send-email-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1450449265-2633-1-git-send-email-jgross@suse.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.xen.org, Ian.Campbell@citrix.com, ian.jackson@eu.citrix.com, stefano.stabellini@eu.citrix.com, wei.liu2@citrix.com List-Id: xen-devel@lists.xenproject.org On 18/12/15 15:34, Juergen Gross wrote: > xl list is currently limited to 1024 domains. Remove the limit. > > Signed-off-by: Juergen Gross Found a bug, will send V2 soon (together with two other patches addressing a similar limitation in xl vm-list and tools/xenstat. Juergen > --- > tools/libxl/libxl.c | 37 ++++++++++++++++++------------------- > 1 file changed, 18 insertions(+), 19 deletions(-) > > diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c > index 9207621..83e37a9 100644 > --- a/tools/libxl/libxl.c > +++ b/tools/libxl/libxl.c > @@ -649,31 +649,30 @@ static void xcinfo2xlinfo(libxl_ctx *ctx, > > libxl_dominfo * libxl_list_domain(libxl_ctx *ctx, int *nb_domain_out) > { > - libxl_dominfo *ptr; > + libxl_dominfo *ptr = NULL; > int i, ret; > xc_domaininfo_t info[1024]; > - int size = 1024; > + int size = 0; > + uint32_t domid = 0; > GC_INIT(ctx); > > - ptr = calloc(size, sizeof(libxl_dominfo)); > - if (!ptr) { > - LOGE(ERROR, "allocating domain info"); > - GC_FREE; > - return NULL; > - } > - > - ret = xc_domain_getinfolist(ctx->xch, 0, 1024, info); > - if (ret<0) { > - LOGE(ERROR, "getting domain info list"); > - free(ptr); > - GC_FREE; > - return NULL; > + for (ret = 1; ret;) { > + ret = xc_domain_getinfolist(ctx->xch, domid, 1024, info); > + if (ret < 0) { > + LOGE(ERROR, "getting domain info list"); > + free(ptr); > + GC_FREE; > + return NULL; > + } > + ptr = libxl__realloc(NOGC, ptr, (size + ret) * sizeof(libxl_dominfo)); > + for (i = 0; i < ret; i++) { > + xcinfo2xlinfo(ctx, &info[i], &ptr[size + i]); > + } > + domid = info[ret - 1].domain + 1; > + size += ret; > } > > - for (i = 0; i < ret; i++) { > - xcinfo2xlinfo(ctx, &info[i], &ptr[i]); > - } > - *nb_domain_out = ret; > + *nb_domain_out = size; > GC_FREE; > return ptr; > } >