From nobody Tue Dec 16 08:35:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1519396098235699.92503562756; Fri, 23 Feb 2018 06:28:18 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E8A405FB27; Fri, 23 Feb 2018 14:28:16 +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 A6A3D60BEE; Fri, 23 Feb 2018 14:28:16 +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 67EEB4A489; Fri, 23 Feb 2018 14:28:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1NERqHi032750 for ; Fri, 23 Feb 2018 09:27:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id E9F089C049; Fri, 23 Feb 2018 14:27:51 +0000 (UTC) Received: from dnr.brq.redhat.com (unknown [10.43.2.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90A879C04F for ; Fri, 23 Feb 2018 14:27:51 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Fri, 23 Feb 2018 15:27:36 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 10/16] vboxDumpNetworks: do not allocate def->nets upfront 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 23 Feb 2018 14:28:17 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Use VIR_APPEND_ELEMENT instead and change the return type to int to catch allocation errors. This removes the need to figure out the adapter count upfront. Signed-off-by: J=C3=A1n Tomko --- src/vbox/vbox_common.c | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index c730c0cc0..c807d2965 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3794,36 +3794,13 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter= *adapter) return net; } =20 -static void +static int vboxDumpNetworks(virDomainDefPtr def, vboxDriverPtr data, IMachine *machin= e, PRUint32 networkAdapterCount) { - PRUint32 netAdpIncCnt =3D 0; size_t i =3D 0; =20 - def->nnets =3D 0; - /* Get which network cards are enabled */ for (i =3D 0; i < networkAdapterCount; i++) { INetworkAdapter *adapter =3D NULL; - - gVBoxAPI.UIMachine.GetNetworkAdapter(machine, i, &adapter); - if (adapter) { - PRBool enabled =3D PR_FALSE; - - gVBoxAPI.UINetworkAdapter.GetEnabled(adapter, &enabled); - if (enabled) - def->nnets++; - - VBOX_RELEASE(adapter); - } - } - - /* Allocate memory for the networkcards which are enabled */ - if (def->nnets > 0) - ignore_value(VIR_ALLOC_N(def->nets, def->nnets)); - - /* Now get the details about the network cards here */ - for (i =3D 0; netAdpIncCnt < def->nnets && i < networkAdapterCount; i+= +) { - INetworkAdapter *adapter =3D NULL; virDomainNetDefPtr net =3D NULL; PRBool enabled =3D PR_FALSE; =20 @@ -3833,11 +3810,16 @@ vboxDumpNetworks(virDomainDefPtr def, vboxDriverPtr= data, IMachine *machine, PRU =20 if (enabled) { net =3D vboxDumpNetwork(data, adapter); - def->nets[netAdpIncCnt++] =3D net; + if (VIR_APPEND_ELEMENT(def->nets, def->nnets, net) < 0) { + VBOX_RELEASE(adapter); + return -1; + } } =20 VBOX_RELEASE(adapter); } + + return 0; } =20 static void @@ -4195,7 +4177,8 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, u= nsigned int flags) =20 if (vboxDumpSharedFolders(def, data, machine) < 0) goto cleanup; - vboxDumpNetworks(def, data, machine, networkAdapterCount); + if (vboxDumpNetworks(def, data, machine, networkAdapterCount) < 0) + goto cleanup; vboxDumpAudio(def, data, machine); =20 if (vboxDumpSerial(def, data, machine, serialPortCount) < 0) --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list