From patchwork Fri Dec 18 14:34:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 7885471 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C39E29F32E for ; Fri, 18 Dec 2015 14:36:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D92A820497 for ; Fri, 18 Dec 2015 14:36:34 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EBD472044C for ; Fri, 18 Dec 2015 14:36:33 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9w74-0001K8-8H; Fri, 18 Dec 2015 14:34:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9w73-0001K0-1E for xen-devel@lists.xen.org; Fri, 18 Dec 2015 14:34:29 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 4A/FE-14715-47914765; Fri, 18 Dec 2015 14:34:28 +0000 X-Env-Sender: jgross@suse.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1450449267!11553015!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38331 invoked from network); 18 Dec 2015 14:34:27 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-12.tower-31.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 18 Dec 2015 14:34:27 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 40FA0AB12; Fri, 18 Dec 2015 14:34:27 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xen.org, Ian.Campbell@citrix.com, ian.jackson@eu.citrix.com, stefano.stabellini@eu.citrix.com, wei.liu2@citrix.com Date: Fri, 18 Dec 2015 15:34:25 +0100 Message-Id: <1450449265-2633-1-git-send-email-jgross@suse.com> X-Mailer: git-send-email 2.6.2 Cc: Juergen Gross Subject: [Xen-devel] [PATCH] libxl: remove the xl list limit of 1024 domains X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP xl list is currently limited to 1024 domains. Remove the limit. Signed-off-by: Juergen Gross --- 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; }