From nobody Sun Feb 8 13:11:00 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=1602098596; cv=none; d=zohomail.com; s=zohoarc; b=mtvlgr/uR7VgklzdgRzmTzPOmDefwVdnZc248fUAcfiaoGTbjS7enK/C6O2gX288OgQdpIhxTlq5Ib6qhwVMX4r4GnRMfHtQdXaG2Q2pMUwWkZ+1sQIJBBEE9r7Nesrh0EDLBguXX8oaWy0L/VHqhkjUaXUPlkablY+4Y1wsW3Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602098596; 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=X7sNdf/WgDs8UB1X+oo/HG84Gr6lmjmSpdMxM+UXi3M=; b=NgOTNgYUcxs3JiD9xghiApFrSeOjrTQE82vR4M+t3lcn2yZntLUafhBg1rrPxestUEFP9VUpl/igbCmkkwmlTyPWQ4Z/KK7rQOm45AQs62BWEwHv2fv16+RL5Jvr8KGixrz2UHWkNVTNq8ZImQKJOXj5Y2i8YlmFT/ja+p+1Dsg= 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 1602098596228616.7292243039773; Wed, 7 Oct 2020 12:23:16 -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-305--JH93dgXMYyV-Yeco_0Fmw-1; Wed, 07 Oct 2020 15:23:05 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 357C6101962F; Wed, 7 Oct 2020 19:22:58 +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 0F406100164C; Wed, 7 Oct 2020 19:22:58 +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 D21C31832FC3; Wed, 7 Oct 2020 19:22:57 +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 097JMip5006005 for ; Wed, 7 Oct 2020 15:22:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0225E1002C04; Wed, 7 Oct 2020 19:22:44 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E0E41001281 for ; Wed, 7 Oct 2020 19:22:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602098594; 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=X7sNdf/WgDs8UB1X+oo/HG84Gr6lmjmSpdMxM+UXi3M=; b=KjlmTgDXLQEOql8ArBrRA73U2ub4nOHoqmWRODPft0yCDyhhLKzHPrUECxGp9DbEXysIEO putzDybqY2E+Z4Wi/9tUV4B924z4UJhNXBqfQkRgYFuvaLPjbOHTNMr3MO4SkCy6PYGAFg PWUNw/xHeNl7BJ7H/Ysb7hs4jxKxJ6o= X-MC-Unique: -JH93dgXMYyV-Yeco_0Fmw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 12/13] conf: use g_new0 Date: Wed, 7 Oct 2020 21:22:28 +0200 Message-Id: <9e0442374a43aee38b5ddf012fa66c43c1a53cf3.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.84 on 10.5.11.22 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/checkpoint_conf.c | 4 ++-- src/conf/domain_capabilities.c | 7 +------ src/conf/domain_event.c | 3 +-- src/conf/domain_nwfilter.c | 3 +-- src/conf/netdev_bandwidth_conf.c | 9 +++------ src/conf/netdev_vlan_conf.c | 4 +--- src/conf/netdev_vport_profile_conf.c | 3 +-- src/conf/networkcommon_conf.c | 3 +-- src/conf/nwfilter_conf.c | 12 ++++-------- src/conf/object_event.c | 11 +++-------- src/conf/secret_conf.c | 3 +-- src/conf/snapshot_conf.c | 4 ++-- src/conf/virchrdev.c | 10 +++------- src/conf/virdomaincheckpointobjlist.c | 10 +++++----- src/conf/virdomainmomentobjlist.c | 6 ++---- src/conf/virdomainobjlist.c | 8 ++------ src/conf/virdomainsnapshotobjlist.c | 9 ++++----- src/conf/virinterfaceobj.c | 5 ++--- src/conf/virnetworkobj.c | 7 +++---- src/conf/virnetworkportdef.c | 4 ++-- src/conf/virnodedeviceobj.c | 7 ++----- src/conf/virnwfilterbindingdef.c | 6 ++---- src/conf/virnwfilterbindingobjlist.c | 8 ++------ src/conf/virnwfilterobj.c | 9 +++------ 24 files changed, 53 insertions(+), 102 deletions(-) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index f97621dabf..e175917eae 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -182,8 +182,8 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt, =20 if ((n =3D virXPathNodeSet("./disks/*", ctxt, &nodes)) < 0) return NULL; - if (n && VIR_ALLOC_N(def->disks, n) < 0) - return NULL; + if (n) + def->disks =3D g_new0(virDomainCheckpointDiskDef, n); def->ndisks =3D n; for (i =3D 0; i < def->ndisks; i++) { if (virDomainCheckpointDiskDefParseXML(nodes[i], ctxt, diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 59ad8937a4..6ee8730111 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -155,15 +155,10 @@ virDomainCapsCPUModelsNew(size_t nmodels) if (!(cpuModels =3D virObjectNew(virDomainCapsCPUModelsClass))) return NULL; =20 - if (VIR_ALLOC_N(cpuModels->models, nmodels) < 0) - goto error; + cpuModels->models =3D g_new0(virDomainCapsCPUModel, nmodels); cpuModels->nmodels_max =3D nmodels; =20 return cpuModels; - - error: - virObjectUnref(cpuModels); - return NULL; } =20 =20 diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index d3acde0236..a8bd9f1595 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -2242,8 +2242,7 @@ virDomainQemuMonitorEventStateRegisterID(virConnectPt= r conn, virCheckFlags(VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX= | VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_NOCAS= E, -1); - if (VIR_ALLOC(data) < 0) - return -1; + data =3D g_new0(virDomainQemuMonitorEventData, 1); data->flags =3D flags; if (event && flags !=3D -1) { if (flags & VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX) { diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c index a72db6f876..ef388d5d02 100644 --- a/src/conf/domain_nwfilter.c +++ b/src/conf/domain_nwfilter.c @@ -44,8 +44,7 @@ virNWFilterBindingDefForNet(const char *vmname, { virNWFilterBindingDefPtr ret; =20 - if (VIR_ALLOC(ret) < 0) - return NULL; + ret =3D g_new0(virNWFilterBindingDef, 1); =20 ret->ownername =3D g_strdup(vmname); =20 diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_c= onf.c index 396ac62019..831ee036ac 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -121,8 +121,7 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidt= h, xmlNodePtr in =3D NULL, out =3D NULL; char *class_id_prop =3D NULL; =20 - if (VIR_ALLOC(def) < 0) - return ret; + def =3D g_new0(virNetDevBandwidth, 1); =20 if (!node || !virXMLNodeNameEqual(node, "bandwidth")) { virReportError(VIR_ERR_INVALID_ARG, "%s", @@ -173,8 +172,7 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidt= h, } =20 if (in) { - if (VIR_ALLOC(def->in) < 0) - goto cleanup; + def->in =3D g_new0(virNetDevBandwidthRate, 1); =20 if (virNetDevBandwidthParseRate(in, def->in) < 0) { /* helper reported error for us */ @@ -189,8 +187,7 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidt= h, } =20 if (out) { - if (VIR_ALLOC(def->out) < 0) - goto cleanup; + def->out =3D g_new0(virNetDevBandwidthRate, 1); =20 if (virNetDevBandwidthParseRate(out, def->out) < 0) { /* helper reported error for us */ diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index 493708fee1..6c93279ec5 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -53,9 +53,7 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ct= xt, virNetDevVlanPtr de goto cleanup; } =20 - if (VIR_ALLOC_N(def->tag, nTags) < 0) - goto cleanup; - + def->tag =3D g_new0(unsigned int, nTags); def->nativeMode =3D 0; def->nativeTag =3D 0; for (i =3D 0; i < nTags; i++) { diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_p= rofile_conf.c index 1dd8439adb..fdc689b38a 100644 --- a/src/conf/netdev_vport_profile_conf.c +++ b/src/conf/netdev_vport_profile_conf.c @@ -39,8 +39,7 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int = flags) virNetDevVPortProfilePtr virtPort =3D NULL; xmlNodePtr cur =3D node->children; =20 - if (VIR_ALLOC(virtPort) < 0) - return NULL; + virtPort =3D g_new0(virNetDevVPortProfile, 1); =20 if ((virtPortType =3D virXMLPropString(node, "type")) && (virtPort->virtPortType =3D virNetDevVPortTypeFromString(virtPortT= ype)) <=3D 0) { diff --git a/src/conf/networkcommon_conf.c b/src/conf/networkcommon_conf.c index 2e51c80174..26eeb6dbda 100644 --- a/src/conf/networkcommon_conf.c +++ b/src/conf/networkcommon_conf.c @@ -44,8 +44,7 @@ virNetDevIPRouteCreate(const char *errorDetail, virNetDevIPRoutePtr def =3D NULL; virSocketAddr testAddr; =20 - if (VIR_ALLOC(def) < 0) - return NULL; + def =3D g_new0(virNetDevIPRoute, 1); =20 def->family =3D g_strdup(family); =20 diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 53794e8f6d..be684c3512 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2069,8 +2069,7 @@ virNWFilterIncludeParse(xmlNodePtr cur) { virNWFilterIncludeDefPtr ret; =20 - if (VIR_ALLOC(ret) < 0) - return NULL; + ret =3D g_new0(virNWFilterIncludeDef, 1); =20 ret->filterref =3D virXMLPropString(cur, "filter"); if (!ret->filterref) { @@ -2423,8 +2422,7 @@ virNWFilterRuleParse(xmlNodePtr node) xmlNodePtr cur; virNWFilterRuleDefPtr ret; =20 - if (VIR_ALLOC(ret) < 0) - return NULL; + ret =3D g_new0(virNWFilterRuleDef, 1); =20 action =3D virXMLPropString(node, "action"); direction =3D virXMLPropString(node, "direction"); @@ -2616,8 +2614,7 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) int chain_priority; const char *name_prefix; =20 - if (VIR_ALLOC(ret) < 0) - return NULL; + ret =3D g_new0(virNWFilterDef, 1); =20 ret->name =3D virXPathString("string(./@name)", ctxt); if (!ret->name) { @@ -2689,8 +2686,7 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) =20 while (curr !=3D NULL) { if (curr->type =3D=3D XML_ELEMENT_NODE) { - if (VIR_ALLOC(entry) < 0) - goto cleanup; + entry =3D g_new0(virNWFilterEntry, 1); =20 if (virXMLNodeNameEqual(curr, "rule")) { if (!(entry->rule =3D virNWFilterRuleParse(curr))) { diff --git a/src/conf/object_event.c b/src/conf/object_event.c index 408e0fd2b2..28e75f8b59 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -424,8 +424,7 @@ virObjectEventCallbackListAddID(virConnectPtr conn, return -1; } /* Allocate new cb */ - if (VIR_ALLOC(cb) < 0) - goto cleanup; + cb =3D g_new0(virObjectEventCallback, 1); cb->conn =3D virObjectRef(conn); *callbackID =3D cb->callbackID =3D cbList->nextID++; cb->cb =3D callback; @@ -501,10 +500,7 @@ virObjectEventQueueFree(virObjectEventQueuePtr queue) static virObjectEventQueuePtr virObjectEventQueueNew(void) { - virObjectEventQueuePtr ret; - - ignore_value(VIR_ALLOC(ret)); - return ret; + return g_new0(virObjectEventQueue, 1); } =20 =20 @@ -566,8 +562,7 @@ virObjectEventStateNew(void) if (!(state =3D virObjectLockableNew(virObjectEventStateClass))) return NULL; =20 - if (VIR_ALLOC(state->callbacks) < 0) - goto error; + state->callbacks =3D g_new0(virObjectEventCallbackList, 1); =20 if (!(state->queue =3D virObjectEventQueueNew())) goto error; diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 2e35348ce1..273987bdb4 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -149,8 +149,7 @@ secretXMLParseNode(xmlDocPtr xml, xmlNodePtr root) =20 ctxt->node =3D root; =20 - if (VIR_ALLOC(def) < 0) - return NULL; + def =3D g_new0(virSecretDef, 1); =20 prop =3D virXPathString("string(./@ephemeral)", ctxt); if (prop !=3D NULL) { diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 7090e3a1b0..31cce15d53 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -367,8 +367,8 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, if ((n =3D virXPathNodeSet("./disks/*", ctxt, &nodes)) < 0) goto cleanup; if (flags & VIR_DOMAIN_SNAPSHOT_PARSE_DISKS) { - if (n && VIR_ALLOC_N(def->disks, n) < 0) - goto cleanup; + if (n) + def->disks =3D g_new0(virDomainSnapshotDiskDef, n); def->ndisks =3D n; for (i =3D 0; i < def->ndisks; i++) { if (virDomainSnapshotDiskDefParseXML(nodes[i], ctxt, &def->dis= ks[i], diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 635aa43c49..c50f9ca720 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -255,8 +255,7 @@ static void virChrdevFDStreamCloseCb(virStreamPtr st G_= GNUC_UNUSED, virChrdevsPtr virChrdevAlloc(void) { virChrdevsPtr devs; - if (VIR_ALLOC(devs) < 0) - return NULL; + devs =3D g_new0(virChrdevs, 1); =20 if (virMutexInit(&devs->lock) < 0) { virReportSystemError(errno, "%s", @@ -388,11 +387,8 @@ int virChrdevOpen(virChrdevsPtr devs, return -1; } =20 - if (VIR_ALLOC(cbdata) < 0) - goto error; - - if (VIR_ALLOC(ent) < 0) - goto error; + cbdata =3D g_new0(virChrdevStreamInfo, 1); + ent =3D g_new0(virChrdevHashEntry, 1); =20 ent->st =3D st; ent->dev =3D g_strdup(path); diff --git a/src/conf/virdomaincheckpointobjlist.c b/src/conf/virdomainchec= kpointobjlist.c index a4942ea706..c6f2fbe46f 100644 --- a/src/conf/virdomaincheckpointobjlist.c +++ b/src/conf/virdomaincheckpointobjlist.c @@ -62,8 +62,8 @@ virDomainCheckpointObjListNew(void) { virDomainCheckpointObjListPtr checkpoints; =20 - if (VIR_ALLOC(checkpoints) < 0) - return NULL; + checkpoints =3D g_new0(virDomainCheckpointObjList, + 1); checkpoints->base =3D virDomainMomentObjListNew(); if (!checkpoints->base) { VIR_FREE(checkpoints); @@ -216,9 +216,9 @@ virDomainListCheckpoints(virDomainCheckpointObjListPtr = checkpoints, =20 if (!chks || count < 0) return count; - if (VIR_ALLOC_N(names, count) < 0 || - VIR_ALLOC_N(list, count + 1) < 0) - goto cleanup; + + names =3D g_new0(char *, count); + list =3D g_new0(virDomainCheckpointPtr, count + 1); =20 if (virDomainCheckpointObjListGetNames(checkpoints, from, names, count, flags) < 0) diff --git a/src/conf/virdomainmomentobjlist.c b/src/conf/virdomainmomentob= jlist.c index 18dbd434fb..8a1eb6b734 100644 --- a/src/conf/virdomainmomentobjlist.c +++ b/src/conf/virdomainmomentobjlist.c @@ -212,8 +212,7 @@ virDomainMomentObjNew(void) { virDomainMomentObjPtr moment; =20 - if (VIR_ALLOC(moment) < 0) - return NULL; + moment =3D g_new0(virDomainMomentObj, 1); =20 VIR_DEBUG("obj=3D%p", moment); =20 @@ -275,8 +274,7 @@ virDomainMomentObjListNew(void) { virDomainMomentObjListPtr moments; =20 - if (VIR_ALLOC(moments) < 0) - return NULL; + moments =3D g_new0(virDomainMomentObjList, 1); moments->objs =3D virHashCreate(50, virDomainMomentObjListDataFree); if (!moments->objs) { VIR_FREE(moments); diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 417025ae9f..46b28cc9a6 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -981,10 +981,7 @@ virDomainObjListCollect(virDomainObjListPtr domlist, =20 virObjectRWLockRead(domlist); sa_assert(domlist->objs); - if (VIR_ALLOC_N(data.vms, virHashSize(domlist->objs)) < 0) { - virObjectRWUnlock(domlist); - return -1; - } + data.vms =3D g_new0(virDomainObjPtr, virHashSize(domlist->objs)); =20 virHashForEach(domlist->objs, virDomainObjListCollectIterator, &data); virObjectRWUnlock(domlist); @@ -1074,8 +1071,7 @@ virDomainObjListExport(virDomainObjListPtr domlist, return -1; =20 if (domains) { - if (VIR_ALLOC_N(doms, nvms + 1) < 0) - goto cleanup; + doms =3D g_new0(virDomainPtr, nvms + 1); =20 for (i =3D 0; i < nvms; i++) { virDomainObjPtr vm =3D vms[i]; diff --git a/src/conf/virdomainsnapshotobjlist.c b/src/conf/virdomainsnapsh= otobjlist.c index 910b0714c7..f13150e463 100644 --- a/src/conf/virdomainsnapshotobjlist.c +++ b/src/conf/virdomainsnapshotobjlist.c @@ -85,8 +85,8 @@ virDomainSnapshotObjListNew(void) { virDomainSnapshotObjListPtr snapshots; =20 - if (VIR_ALLOC(snapshots) < 0) - return NULL; + snapshots =3D g_new0(virDomainSnapshotObjList, + 1); snapshots->base =3D virDomainMomentObjListNew(); if (!snapshots->base) { VIR_FREE(snapshots); @@ -267,9 +267,8 @@ virDomainListSnapshots(virDomainSnapshotObjListPtr snap= shots, =20 if (!snaps || count < 0) return count; - if (VIR_ALLOC_N(names, count) < 0 || - VIR_ALLOC_N(list, count + 1) < 0) - goto cleanup; + names =3D g_new0(char *, count); + list =3D g_new0(virDomainSnapshotPtr, count + 1); =20 if (virDomainSnapshotObjListGetNames(snapshots, from, names, count, flags) < 0) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 43ba395d2b..5a5fd65e14 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -319,9 +319,8 @@ virInterfaceObjListExport(virConnectPtr conn, .nifaces =3D 0, .error =3D false }; =20 virObjectRWLockRead(ifaceobjs); - if (ifaces && VIR_ALLOC_N(data.ifaces, - virHashSize(ifaceobjs->objsName) + 1) < 0) - goto cleanup; + if (ifaces) + data.ifaces =3D g_new0(virInterfacePtr, virHashSize(ifaceobjs->obj= sName)); =20 virHashForEach(ifaceobjs->objsName, virInterfaceObjListExportCallback,= &data); =20 diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index aefe23fde1..1fcfa9cdc2 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1406,8 +1406,8 @@ virNetworkObjListExport(virConnectPtr conn, .nnets =3D 0, .error =3D false }; =20 virObjectRWLockRead(netobjs); - if (nets && VIR_ALLOC_N(data.nets, virHashSize(netobjs->objs) + 1) < 0) - goto cleanup; + if (nets) + data.nets =3D g_new0(virNetworkPtr, virHashSize(netobjs->objs)); =20 virHashForEach(netobjs->objs, virNetworkObjListExportCallback, &data); =20 @@ -1801,8 +1801,7 @@ virNetworkObjPortListExport(virNetworkPtr net, if (ports) { *ports =3D NULL; =20 - if (VIR_ALLOC_N(data.ports, virHashSize(obj->ports) + 1) < 0) - goto cleanup; + data.ports =3D g_new0(virNetworkPortPtr, virHashSize(obj->ports)); } =20 virHashForEach(obj->ports, virNetworkObjPortListExportCallback, &data); diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 1db3dc69e2..3183078195 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -95,8 +95,8 @@ virNetworkPortDefParseXML(xmlXPathContextPtr ctxt) g_autofree char *managed =3D NULL; g_autofree char *driver =3D NULL; =20 - if (VIR_ALLOC(def) < 0) - return NULL; + def =3D g_new0(virNetworkPortDef, + 1); =20 uuid =3D virXPathString("string(./uuid)", ctxt); if (!uuid) { diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 8aefd15e94..28905c67b6 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -930,11 +930,8 @@ virNodeDeviceObjListExport(virConnectPtr conn, .devices =3D NULL, .ndevices =3D 0, .error =3D false }; =20 virObjectRWLockRead(devs); - if (devices && - VIR_ALLOC_N(data.devices, virHashSize(devs->objs) + 1) < 0) { - virObjectRWUnlock(devs); - return -1; - } + if (devices) + data.devices =3D g_new0(virNodeDevicePtr, virHashSize(devs->objs)); =20 virHashForEach(devs->objs, virNodeDeviceObjListExportCallback, &data); virObjectRWUnlock(devs); diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbinding= def.c index f286bdd840..81f8e72182 100644 --- a/src/conf/virnwfilterbindingdef.c +++ b/src/conf/virnwfilterbindingdef.c @@ -51,8 +51,7 @@ virNWFilterBindingDefCopy(virNWFilterBindingDefPtr src) { virNWFilterBindingDefPtr ret; =20 - if (VIR_ALLOC(ret) < 0) - return NULL; + ret =3D g_new0(virNWFilterBindingDef, 1); =20 ret->ownername =3D g_strdup(src->ownername); =20 @@ -88,8 +87,7 @@ virNWFilterBindingDefParseXML(xmlXPathContextPtr ctxt) char *mac =3D NULL; xmlNodePtr node; =20 - if (VIR_ALLOC(ret) < 0) - return NULL; + ret =3D g_new0(virNWFilterBindingDef, 1); =20 ret->portdevname =3D virXPathString("string(./portdev/@name)", ctxt); if (!ret->portdevname) { diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbin= dingobjlist.c index 97e4d3c49b..328b1b8482 100644 --- a/src/conf/virnwfilterbindingobjlist.c +++ b/src/conf/virnwfilterbindingobjlist.c @@ -434,10 +434,7 @@ virNWFilterBindingObjListCollect(virNWFilterBindingObj= ListPtr domlist, =20 virObjectRWLockRead(domlist); sa_assert(domlist->objs); - if (VIR_ALLOC_N(data.bindings, virHashSize(domlist->objs)) < 0) { - virObjectRWUnlock(domlist); - return -1; - } + data.bindings =3D g_new0(virNWFilterBindingObjPtr, virHashSize(domlist= ->objs)); =20 virHashForEach(domlist->objs, virNWFilterBindingObjListCollectIterator= , &data); virObjectRWUnlock(domlist); @@ -467,8 +464,7 @@ virNWFilterBindingObjListExport(virNWFilterBindingObjLi= stPtr bindings, return -1; =20 if (bindinglist) { - if (VIR_ALLOC_N(*bindinglist, nbindings + 1) < 0) - goto cleanup; + *bindinglist =3D g_new0(virNWFilterBindingPtr, nbindings + 1); =20 for (i =3D 0; i < nbindings; i++) { virNWFilterBindingObjPtr binding =3D bindingobjs[i]; diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index c9e224061d..fce402f907 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -53,8 +53,7 @@ virNWFilterObjNew(void) { virNWFilterObjPtr obj; =20 - if (VIR_ALLOC(obj) < 0) - return NULL; + obj =3D g_new0(virNWFilterObj, 1); =20 if (virMutexInitRecursive(&obj->lock) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -120,8 +119,7 @@ virNWFilterObjListNew(void) { virNWFilterObjListPtr nwfilters; =20 - if (VIR_ALLOC(nwfilters) < 0) - return NULL; + nwfilters =3D g_new0(virNWFilterObjList, 1); return nwfilters; } =20 @@ -450,8 +448,7 @@ virNWFilterObjListExport(virConnectPtr conn, goto cleanup; } =20 - if (VIR_ALLOC_N(tmp_filters, nwfilters->count + 1) < 0) - goto cleanup; + tmp_filters =3D g_new0(virNWFilterPtr, nwfilters->count + 1); =20 for (i =3D 0; i < nwfilters->count; i++) { obj =3D nwfilters->objs[i]; --=20 2.26.2