From nobody Sun Feb 8 23:06:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602074226; cv=none; d=zohomail.com; s=zohoarc; b=nU+J31Tc8iFZuaCHxP5VHxd6ZcisrJy9L3Bu9G9i/Q5+4HCMpzvEnOQAzL0Bb1QYtucDwG6BiCHmgFXvU6Sk8w3sXFNYcHSnX6DYBl7nSMLgxtWj5PJ167SzsriudEeRNu06yL34oz6ZUUwW6cJg5SNuXII1aSwe8Ywud5VZ4ac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602074226; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0o2HMpnlc3HFQEb+HvmqJgDv/yZhkTtmEKq82bBa+e4=; b=XEmabt1pA/GF+alN3Gj2hwotcQ9r8JG4DM/B5bAWAzkRP5HN8NZtDhCbTmuemZWAvmI2OhpiSq4LGIIwLkUztOLYUOyBrNYe6l8e9asBqEfkTjdXjATxtI7t8rIfbMFBBWxgBi33PzARVoOp8As0Elw0nSlzk3hKIiXShRcpw2w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602074226664436.55963971977553; Wed, 7 Oct 2020 05:37:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-54-dbvWcnv3OfyRem491FQH8A-1; Wed, 07 Oct 2020 08:35:58 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A07ED9CC09; Wed, 7 Oct 2020 12:35:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7E30876644; Wed, 7 Oct 2020 12:35:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4CD178C7A3; Wed, 7 Oct 2020 12:35:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 097CZhkJ012422 for ; Wed, 7 Oct 2020 08:35:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7D2ED702E7; Wed, 7 Oct 2020 12:35:43 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0368976642 for ; Wed, 7 Oct 2020 12:35:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602074225; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0o2HMpnlc3HFQEb+HvmqJgDv/yZhkTtmEKq82bBa+e4=; b=V8nCCCTOmFlnuO4hRQMqAYBCu5Bzl+YZ1RWcpwCJ7EGsiF3vHWuUOG+QRo3wAz5U//tKPi liH9gjBtcHrnfVcX/1eSxDRp7/5cXvpEjClOF38KmKg/jmyiBUC1dbFqVEIXueAf4nYJES eM7K+sSQ+k1c0srbG2lNCcRBtPbjiOA= X-MC-Unique: dbvWcnv3OfyRem491FQH8A-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCHv2 05/16] qemu: agent: expand addrs upfront Date: Wed, 7 Oct 2020 14:35:26 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) qemuAgentGetInterfaceOneAddress returns exactly one address for every iteration of the loop (and we error out if not). Instead of expanding the addrs by one on every iteration, do it upfront since we know how many times the loop will execute. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_agent.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index c6878c8590..0394a72518 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2213,20 +2213,18 @@ qemuAgentGetInterfaces(qemuAgentPtr agent, /* If current iface already exists, continue with the count */ addrs_count =3D iface->naddrs; =20 + if (VIR_EXPAND_N(iface->addrs, addrs_count, + virJSONValueArraySize(ip_addr_arr)) < 0) + goto error; + for (j =3D 0; j < virJSONValueArraySize(ip_addr_arr); j++) { virJSONValuePtr ip_addr_obj =3D virJSONValueArrayGet(ip_addr_a= rr, j); - virDomainIPAddressPtr ip_addr; - - if (VIR_EXPAND_N(iface->addrs, addrs_count, 1) < 0) - goto error; - - ip_addr =3D &iface->addrs[addrs_count - 1]; + virDomainIPAddressPtr ip_addr =3D iface->addrs + iface->naddrs; + iface->naddrs++; =20 if (qemuAgentGetInterfaceOneAddress(ip_addr, ip_addr_obj, name= ) < 0) goto error; } - - iface->naddrs =3D addrs_count; } =20 *ifaces =3D g_steal_pointer(&ifaces_ret); --=20 2.26.2