From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [PATCH 2/6] xl: Use ARRAY_EXTEND_INIT for vtpms and nics Date: Tue, 7 Jul 2015 17:13:21 +0100 Message-ID: <1436285605-18411-3-git-send-email-ian.jackson@eu.citrix.com> References: <1436285605-18411-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1436285605-18411-1-git-send-email-ian.jackson@eu.citrix.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.xensource.com Cc: Ian Jackson List-Id: xen-devel@lists.xenproject.org This removes two open-coded reallocs. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 31d8260..6ea4e6b 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1701,11 +1701,9 @@ static void parse_config_data(const char *config_source, char *p, *p2; bool got_backend = false; - d_config->vtpms = (libxl_device_vtpm *) realloc(d_config->vtpms, - sizeof(libxl_device_vtpm) * (d_config->num_vtpms+1)); - vtpm = d_config->vtpms + d_config->num_vtpms; - libxl_device_vtpm_init(vtpm); - vtpm->devid = d_config->num_vtpms; + vtpm = ARRAY_EXTEND_INIT(d_config->vtpms, + d_config->num_vtpms, + libxl_device_vtpm_init); p = strtok(buf2, ","); if(p) { @@ -1735,7 +1733,6 @@ static void parse_config_data(const char *config_source, exit(1); } free(buf2); - d_config->num_vtpms++; } } @@ -1825,10 +1822,9 @@ static void parse_config_data(const char *config_source, char *buf2 = strdup(buf); char *p; - d_config->nics = (libxl_device_nic *) realloc(d_config->nics, sizeof (libxl_device_nic) * (d_config->num_nics+1)); - nic = d_config->nics + d_config->num_nics; - libxl_device_nic_init(nic); - nic->devid = d_config->num_nics; + nic = ARRAY_EXTEND_INIT(d_config->nics, + d_config->num_nics, + libxl_device_nic_init); set_default_nic_values(nic); p = strtok(buf2, ","); @@ -1841,7 +1837,6 @@ static void parse_config_data(const char *config_source, } while ((p = strtok(NULL, ",")) != NULL); skip_nic: free(buf2); - d_config->num_nics++; } } -- 1.7.10.4