From nobody Sun Feb 8 05:35:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1602098574; cv=none; d=zohomail.com; s=zohoarc; b=CKoQNDPCwfpAES28Jf/amvS/5VbLzE3XcldhlukP5Vk312cOx+gSnBjdCeUcDVRRwKqLSvvLumNPAiNP4c4bZwSHVhxhTsPnTizsJT1LneBUc1S8s+1HvPP3f2iujA1qNXvT9RvuXP3NMKEeQosKoXtyhEHcMaGIkk/F3zsxpsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602098574; 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=FKhosaBe3CfUzTTRBAwI6uxSWlWkppo5DG/duj42Rb4=; b=a+a/DNDAQ1ndVmCOr52Bw+9LsZ74+QnoCPZlL1FckyWcZnmKdf06HlgDR0C7TXWvSt2KSHvyRI40TT/QEpGrv0UjhcXlG6NXFqmgrfGR96jA8ulHYqAGIjZSFqaiHCq6Lx52g+Ip2IP8nxwur4KU8vX7o3Sg03dtjCiLpf1QqQk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1602098574365713.7821798329002; Wed, 7 Oct 2020 12:22:54 -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-443-UMUoBmizMna9taqpSPD-uA-1; Wed, 07 Oct 2020 15:22:50 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id C5D1118A822F; Wed, 7 Oct 2020 19:22:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A570A6EF43; Wed, 7 Oct 2020 19:22:41 +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 72E6B1832FD3; Wed, 7 Oct 2020 19:22:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 097JManR005895 for ; Wed, 7 Oct 2020 15:22:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id A702E1001281; Wed, 7 Oct 2020 19:22:36 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F9F9100164C for ; Wed, 7 Oct 2020 19:22:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602098573; 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=FKhosaBe3CfUzTTRBAwI6uxSWlWkppo5DG/duj42Rb4=; b=H1I3RFbubvxo8mlMKZHRqbDKHn8PUYygX14cLSc5jFrc6gPf21xtH9Kv/YgwE8ZM3Q+6UU KIChv9xVbisdsM/3o3JVgA+Xc/9TSXGqNBMi2+B14h7DUKGlC+wZsP386+3ql1SXd9MbJ1 m3MVccPtLCXQOShMhxn9bbfCpy9ncCY= X-MC-Unique: UMUoBmizMna9taqpSPD-uA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 03/13] conf: network: use g_new0 Date: Wed, 7 Oct 2020 21:22:19 +0200 Message-Id: <021a37f12d1b95f6594b2f714d11bb31020cc27f.1602098503.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.13 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) Signed-off-by: J=C3=A1n Tomko --- src/conf/network_conf.c | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 2fcd498107..4f1115e103 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -442,9 +442,7 @@ virNetworkDHCPLeaseTimeDefParseXML(virNetworkDHCPLeaseT= imeDefPtr *lease, } } =20 - if (VIR_ALLOC(new_lease) < 0) - return -1; - + new_lease =3D g_new0(virNetworkDHCPLeaseTimeDef, 1); new_lease->expiry =3D expiry; new_lease->unit =3D unit; =20 @@ -976,8 +974,7 @@ virNetworkDNSDefParseXML(const char *networkName, return -1; } if (nfwds > 0) { - if (VIR_ALLOC_N(def->forwarders, nfwds) < 0) - return -1; + def->forwarders =3D g_new0(virNetworkDNSForwarder, nfwds); =20 for (i =3D 0; i < nfwds; i++) { g_autofree char *addr =3D virXMLPropString(fwdNodes[i], "addr"= ); @@ -1009,8 +1006,7 @@ virNetworkDNSDefParseXML(const char *networkName, return -1; } if (nhosts > 0) { - if (VIR_ALLOC_N(def->hosts, nhosts) < 0) - return -1; + def->hosts =3D g_new0(virNetworkDNSHostDef, nhosts); =20 for (i =3D 0; i < nhosts; i++) { if (virNetworkDNSHostDefParseXML(networkName, hostNodes[i], @@ -1029,8 +1025,7 @@ virNetworkDNSDefParseXML(const char *networkName, return -1; } if (nsrvs > 0) { - if (VIR_ALLOC_N(def->srvs, nsrvs) < 0) - return -1; + def->srvs =3D g_new0(virNetworkDNSSrvDef, nsrvs); =20 for (i =3D 0; i < nsrvs; i++) { if (virNetworkDNSSrvDefParseXML(networkName, srvNodes[i], ctxt, @@ -1049,8 +1044,7 @@ virNetworkDNSDefParseXML(const char *networkName, return -1; } if (ntxts > 0) { - if (VIR_ALLOC_N(def->txts, ntxts) < 0) - return -1; + def->txts =3D g_new0(virNetworkDNSTxtDef, ntxts); =20 for (i =3D 0; i < ntxts; i++) { if (virNetworkDNSTxtDefParseXML(networkName, txtNodes[i], @@ -1551,8 +1545,7 @@ virNetworkForwardDefParseXML(const char *networkName, } =20 if (nForwardIfs > 0 || forwardDev) { - if (VIR_ALLOC_N(def->ifs, MAX(nForwardIfs, 1)) < 0) - return -1; + def->ifs =3D g_new0(virNetworkForwardIfDef, MAX(nForwardIfs, 1)); =20 if (forwardDev) { def->ifs[0].device.dev =3D g_steal_pointer(&forwardDev); @@ -1603,8 +1596,7 @@ virNetworkForwardDefParseXML(const char *networkName, } =20 } else if (nForwardAddrs > 0) { - if (VIR_ALLOC_N(def->ifs, nForwardAddrs) < 0) - return -1; + def->ifs =3D g_new0(virNetworkForwardIfDef, nForwardAddrs); =20 for (i =3D 0; i < nForwardAddrs; i++) { g_autofree char *addrType =3D NULL; @@ -1661,8 +1653,7 @@ virNetworkForwardDefParseXML(const char *networkName, networkName); return -1; } else if (nForwardPfs =3D=3D 1) { - if (VIR_ALLOC_N(def->pfs, nForwardPfs) < 0) - return -1; + def->pfs =3D g_new0(virNetworkForwardPfDef, nForwardPfs); =20 forwardDev =3D virXMLPropString(*forwardPfNodes, "dev"); if (!forwardDev) { @@ -1707,8 +1698,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, xmlNodePtr vlanNode; xmlNodePtr metadataNode =3D NULL; =20 - if (VIR_ALLOC(def) < 0) - return NULL; + def =3D g_new0(virNetworkDef, 1); =20 /* Extract network name */ def->name =3D virXPathString("string(./name[1])", ctxt); @@ -1863,8 +1853,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, size_t i; =20 /* allocate array to hold all the portgroups */ - if (VIR_ALLOC_N(def->portGroups, nPortGroups) < 0) - return NULL; + def->portGroups =3D g_new0(virPortGroupDef, nPortGroups); /* parse each portgroup */ for (i =3D 0; i < nPortGroups; i++) { if (virNetworkPortGroupParseXML(&def->portGroups[i], @@ -1883,8 +1872,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, size_t i; =20 /* allocate array to hold all the addrs */ - if (VIR_ALLOC_N(def->ips, nips) < 0) - return NULL; + def->ips =3D g_new0(virNetworkIPDef, nips); /* parse each addr */ for (i =3D 0; i < nips; i++) { if (virNetworkIPDefParseXML(def->name, @@ -1904,8 +1892,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, size_t i; =20 /* allocate array to hold all the route definitions */ - if (VIR_ALLOC_N(def->routes, nRoutes) < 0) - return NULL; + def->routes =3D g_new0(virNetDevIPRoutePtr, nRoutes); /* parse each definition */ for (i =3D 0; i < nRoutes; i++) { virNetDevIPRoutePtr route =3D NULL; --=20 2.26.2