From nobody Sun Feb 8 04:13:18 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=1601039963; cv=none; d=zohomail.com; s=zohoarc; b=PA1WfXQSwmhZ7ssE2Exsait4Q9CgA7tnKWhUD/M2zDB3oAhjJpGW1GI/UJAm8b9V8zAxNswg6Fc+EVgrVkbMzLwLMs5mvza2TYFP/efFbupb+Cae1qe3JhNPZdQI3YI9V44fEt3IyHQLN7BZJveMEKSdt5fXQnB871dvyZsY/r0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601039963; 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=ZepLfF667uoQhSJ9YX5Jqxfdt26eMZnkpuC0/80bm9A=; b=K4fUz8s4JqSKP1zSenNcWyNjySVFUFpQpx6JJeceA2vgmV7foA0SO9BarzCeiKyezSKmrL5BANzCWiCoa8C3yl7hzjUOZuymM2egwZ/Ic/GZPX5aQ+4FW79iyhZVjYWDlfJs7pmohwXXJs0ymoyvxpXOvbx4cWjUpLWENDiGCU0= 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 1601039963905490.8976404741643; Fri, 25 Sep 2020 06:19:23 -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-380-ULdcDOQ1MnWTkyINtC8--g-1; Fri, 25 Sep 2020 09:19:20 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8BCFF10BBECF; Fri, 25 Sep 2020 13:19:14 +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 6BCD060C17; Fri, 25 Sep 2020 13:19:14 +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 39F661826D2F; Fri, 25 Sep 2020 13:19:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08PDGTk0005203 for ; Fri, 25 Sep 2020 09:16:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 469C65C1C2; Fri, 25 Sep 2020 13:16:29 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AD775C1BB for ; Fri, 25 Sep 2020 13:16:28 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601039962; 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=ZepLfF667uoQhSJ9YX5Jqxfdt26eMZnkpuC0/80bm9A=; b=EdtvtFfb96BZf9BG0ZdMzQ8JoUdgIy5d/w7oqP5rGJWUbZLrZ14po+Ql/FVlLCEPM33Crk 4GYCds1AjYYUDuhITXDiFaQZ74i+X/8J0yKZ29TeBz+d79XLKVvwgC4og/ufjie3KXOLac +sZ5G9tYkE9VCytdzKu2tslrfnUamk4= X-MC-Unique: ULdcDOQ1MnWTkyINtC8--g-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 7/7] storage: use g_new0 instead of VIR_ALLOC* Date: Fri, 25 Sep 2020 15:16:13 +0200 Message-Id: <5dadeeafa0a07e47a66ea1a87632cf4c88fe8626.1601039656.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.12 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 Reviewed-by: Peter Krempa --- src/storage/storage_backend_disk.c | 6 ++-- src/storage/storage_backend_fs.c | 8 ++--- src/storage/storage_backend_gluster.c | 12 +++----- src/storage/storage_backend_iscsi.c | 8 ++--- src/storage/storage_backend_iscsi_direct.c | 13 ++++----- src/storage/storage_backend_logical.c | 6 ++-- src/storage/storage_backend_mpath.c | 3 +- src/storage/storage_backend_rbd.c | 29 +++++++----------- src/storage/storage_backend_scsi.c | 4 +-- src/storage/storage_backend_sheepdog.c | 3 +- src/storage/storage_backend_zfs.c | 3 +- src/storage/storage_driver.c | 14 +++------ src/storage/storage_file_fs.c | 3 +- src/storage/storage_file_gluster.c | 6 ++-- src/storage/storage_util.c | 34 ++++++++-------------- 15 files changed, 52 insertions(+), 100 deletions(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backe= nd_disk.c index ec0679d353..af90f3fc45 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -74,8 +74,7 @@ virStorageBackendDiskMakeDataVol(virStoragePoolObjPtr poo= l, * we're discovering the existing partitions for the pool */ addVol =3D true; - if (VIR_ALLOC(vol) < 0) - return -1; + vol =3D g_new0(virStorageVolDef, 1); vol->name =3D g_strdup(partname); } =20 @@ -132,8 +131,7 @@ virStorageBackendDiskMakeDataVol(virStoragePoolObjPtr p= ool, } =20 if (vol->source.extents =3D=3D NULL) { - if (VIR_ALLOC(vol->source.extents) < 0) - goto error; + vol->source.extents =3D g_new0(virStorageVolSourceExtent, 1); vol->source.nextent =3D 1; =20 if (virStrToLong_ull(groups[3], NULL, 10, diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend= _fs.c index 30c2367df4..b98d06c644 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -76,8 +76,7 @@ virStorageBackendFileSystemNetFindPoolSourcesFunc(char **= const groups, if (!(src =3D virStoragePoolSourceListNewSource(&state->list))) return -1; =20 - if (VIR_ALLOC_N(src->hosts, 1) < 0) - return -1; + src->hosts =3D g_new0(virStoragePoolSourceHost, 1); src->nhost =3D 1; =20 src->hosts[0].name =3D g_strdup(state->host); @@ -576,9 +575,8 @@ virStoragePoolDefFSNamespaceParse(xmlXPathContextPtr ct= xt, if (nnodes =3D=3D 0) return 0; =20 - if (VIR_ALLOC(cmdopts) < 0 || - VIR_ALLOC_N(cmdopts->options, nnodes) < 0) - goto cleanup; + cmdopts =3D g_new0(virStoragePoolFSMountOptionsDef, 1); + cmdopts->options =3D g_new0(char *, nnodes); =20 for (i =3D 0; i < nnodes; i++) { if (!(cmdopts->options[cmdopts->noptions] =3D diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_ba= ckend_gluster.c index 4763a569e3..6c99c270da 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -97,16 +97,14 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) trailing_slash =3D false; } =20 - if (VIR_ALLOC(ret) < 0) - return NULL; + ret =3D g_new0(virStorageBackendGlusterState, 1); =20 ret->volname =3D g_strdup(name); ret->dir =3D g_strdup_printf("%s%s", dir ? dir : "/", trailing_slash ?= "" : "/"); =20 /* FIXME: Currently hard-coded to tcp transport; XML needs to be * extended to allow alternate transport */ - if (VIR_ALLOC(ret->uri) < 0) - goto error; + ret->uri =3D g_new0(virURI, 1); ret->uri->scheme =3D g_strdup("gluster"); ret->uri->server =3D g_strdup(def->source.hosts[0].name); ret->uri->path =3D g_strdup_printf("/%s%s", ret->volname, ret->dir); @@ -151,8 +149,7 @@ virStorageBackendGlusterRead(glfs_fd_t *fd, char *s; size_t nread =3D 0; =20 - if (VIR_ALLOC_N(*buf, len) < 0) - return -1; + *buf =3D g_new0(char, len); =20 s =3D *buf; while (len) { @@ -245,8 +242,7 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlu= sterStatePtr state, return ret; } =20 - if (VIR_ALLOC(vol) < 0) - goto cleanup; + vol =3D g_new0(virStorageVolDef, 1); =20 if (virStorageBackendUpdateVolTargetInfoFD(&vol->target, -1, st) < 0) goto cleanup; diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_back= end_iscsi.c index 32892e1d75..436d5e09c7 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -189,13 +189,11 @@ virStorageBackendISCSIFindPoolSources(const char *src= Spec, &ntargets, &targets) < 0) goto cleanup; =20 - if (VIR_ALLOC_N(list.sources, ntargets) < 0) - goto cleanup; + list.sources =3D g_new0(virStoragePoolSource, ntargets); =20 for (i =3D 0; i < ntargets; i++) { - if (VIR_ALLOC_N(list.sources[i].devices, 1) < 0 || - VIR_ALLOC_N(list.sources[i].hosts, 1) < 0) - goto cleanup; + list.sources[i].devices =3D g_new0(virStoragePoolSourceDevice, 1); + list.sources[i].hosts =3D g_new0(virStoragePoolSourceHost, 1); list.sources[i].nhost =3D 1; list.sources[i].hosts[0] =3D source->hosts[0]; list.sources[i].initiator =3D source->initiator; diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/stora= ge_backend_iscsi_direct.c index 027fa83de7..66ceb48e6a 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -309,8 +309,7 @@ virISCSIDirectRefreshVol(virStoragePoolObjPtr pool, if (virISCSIDirectTestUnitReady(iscsi, lun) < 0) return -1; =20 - if (VIR_ALLOC(vol) < 0) - return -1; + vol =3D g_new0(virStorageVolDef, 1); =20 vol->type =3D VIR_STORAGE_VOL_NETWORK; =20 @@ -518,13 +517,11 @@ virStorageBackendISCSIDirectFindPoolSources(const cha= r *srcSpec, if (virISCSIDirectScanTargets(source->initiator.iqn, portal, &ntargets= , &targets) < 0) goto cleanup; =20 - if (VIR_ALLOC_N(list.sources, ntargets) < 0) - goto cleanup; + list.sources =3D g_new0(virStoragePoolSource, ntargets); =20 for (i =3D 0; i < ntargets; i++) { - if (VIR_ALLOC_N(list.sources[i].devices, 1) < 0 || - VIR_ALLOC_N(list.sources[i].hosts, 1) < 0) - goto cleanup; + list.sources[i].devices =3D g_new0(virStoragePoolSourceDevice, 1); + list.sources[i].hosts =3D g_new0(virStoragePoolSourceHost, 1); list.sources[i].nhost =3D 1; list.sources[i].hosts[0] =3D source->hosts[0]; list.sources[i].initiator =3D source->initiator; @@ -628,7 +625,7 @@ virStorageBackendISCSIDirectVolWipeZero(virStorageVolDe= fPtr vol, return ret; if (virISCSIDirectGetVolumeCapacity(iscsi, lun, &block_size, &nb_block= )) return ret; - if (VIR_ALLOC_N(data, block_size * BLOCK_PER_PACKET)) + data =3D g_new0(unsigned char, block_size * BLOCK_PER_PACKET); return ret; =20 while (lba < nb_block) { diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_ba= ckend_logical.c index e3debc390c..ead3dab4fd 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -161,8 +161,7 @@ virStorageBackendLogicalParseVolExtents(virStorageVolDe= fPtr vol, } =20 /* Allocate space for 'nextents' regex_unit strings plus a comma for e= ach */ - if (VIR_ALLOC_N(regex, nextents * (strlen(regex_unit) + 1) + 1) < 0) - goto cleanup; + regex =3D g_new0(char, nextents * (strlen(regex_unit) + 1) + 1); strcat(regex, regex_unit); for (i =3D 1; i < nextents; i++) { /* "," is the separator of "devices" field */ @@ -252,8 +251,7 @@ virStorageBackendLogicalMakeVol(char **const groups, =20 /* Or a completely new volume */ if (vol =3D=3D NULL) { - if (VIR_ALLOC(vol) < 0) - return -1; + vol =3D g_new0(virStorageVolDef, 1); =20 is_new_vol =3D true; vol->type =3D VIR_STORAGE_VOL_BLOCK; diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_back= end_mpath.c index f474ab32a9..20e9b34bbf 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -49,8 +49,7 @@ virStorageBackendMpathNewVol(virStoragePoolObjPtr pool, virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); g_autoptr(virStorageVolDef) vol =3D NULL; =20 - if (VIR_ALLOC(vol) < 0) - return -1; + vol =3D g_new0(virStorageVolDef, 1); =20 vol->type =3D VIR_STORAGE_VOL_BLOCK; =20 diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backen= d_rbd.c index 09928fdc3c..1630d6eede 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -94,12 +94,10 @@ virStoragePoolDefRBDNamespaceParse(xmlXPathContextPtr c= txt, if (nnodes =3D=3D 0) return 0; =20 - if (VIR_ALLOC(cmdopts) < 0) - goto cleanup; + cmdopts =3D g_new0(virStoragePoolRBDConfigOptionsDef, 1); =20 - if (VIR_ALLOC_N(cmdopts->names, nnodes) < 0 || - VIR_ALLOC_N(cmdopts->values, nnodes) < 0) - goto cleanup; + cmdopts->names =3D g_new0(char *, nnodes); + cmdopts->values =3D g_new0(char *, nnodes); =20 for (i =3D 0; i < nnodes; i++) { if (!(cmdopts->names[cmdopts->noptions] =3D @@ -384,8 +382,7 @@ virStorageBackendRBDNewState(virStoragePoolObjPtr pool) virStorageBackendRBDStatePtr ptr; virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); =20 - if (VIR_ALLOC(ptr) < 0) - return NULL; + ptr =3D g_new0(virStorageBackendRBDState, 1); =20 if (virStorageBackendRBDOpenRADOSConn(ptr, def) < 0) goto error; @@ -604,8 +601,7 @@ virStorageBackendRBDGetVolNames(virStorageBackendRBDSta= tePtr ptr) } } =20 - if (VIR_ALLOC_N(names, nimages + 1) < 0) - goto error; + names =3D g_new0(char *, nimages + 1); nnames =3D nimages; =20 for (i =3D 0; i < nimages; i++) @@ -633,8 +629,7 @@ virStorageBackendRBDGetVolNames(virStorageBackendRBDSta= tePtr ptr) const char *name; =20 while (true) { - if (VIR_ALLOC_N(namebuf, max_size) < 0) - goto error; + namebuf =3D g_new0(char, max_size); =20 rc =3D rbd_list(ptr->ioctx, namebuf, &max_size); if (rc >=3D 0) @@ -712,8 +707,7 @@ virStorageBackendRBDRefreshPool(virStoragePoolObjPtr po= ol) for (i =3D 0; names[i] !=3D NULL; i++) { g_autoptr(virStorageVolDef) vol =3D NULL; =20 - if (VIR_ALLOC(vol) < 0) - goto cleanup; + vol =3D g_new0(virStorageVolDef, 1); =20 vol->name =3D g_steal_pointer(&names[i]); =20 @@ -770,8 +764,7 @@ virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioct= x, } =20 do { - if (VIR_ALLOC_N(snaps, max_snaps)) - goto cleanup; + snaps =3D g_new0(rbd_snap_info_t, max_snaps); =20 snap_count =3D rbd_snap_list(image, snaps, &max_snaps); if (snap_count <=3D 0) @@ -1028,8 +1021,7 @@ virStorageBackendRBDSnapshotFindNoDiff(rbd_image_t im= age, } =20 do { - if (VIR_ALLOC_N(snaps, max_snaps)) - goto cleanup; + snaps =3D g_new0(rbd_snap_info_t, max_snaps); =20 snap_count =3D rbd_snap_list(image, snaps, &max_snaps); if (snap_count <=3D 0) @@ -1320,8 +1312,7 @@ virStorageBackendRBDVolWipeZero(rbd_image_t image, unsigned long long length; g_autofree char *writebuf =3D NULL; =20 - if (VIR_ALLOC_N(writebuf, info->obj_size * stripe_count) < 0) - return -1; + writebuf =3D g_new0(char, info->obj_size * stripe_count); =20 while (offset < info->size) { length =3D MIN((info->size - offset), (info->obj_size * stripe_cou= nt)); diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backe= nd_scsi.c index b5866935d1..69a01d1a24 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -329,9 +329,7 @@ createVport(virStoragePoolDefPtr def, * retry logic set to true. If the thread isn't created, then no big * deal since it's still possible to refresh the pool later. */ - if (VIR_ALLOC(cbdata) < 0) - return -1; - + cbdata =3D g_new0(virStoragePoolFCRefreshInfo, 1); memcpy(cbdata->pool_uuid, def->uuid, VIR_UUID_BUFLEN); cbdata->fchost_name =3D g_steal_pointer(&name); =20 diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_b= ackend_sheepdog.c index f253c0ed57..12ff9f44d0 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -118,8 +118,7 @@ virStorageBackendSheepdogAddVolume(virStoragePoolObjPtr= pool, const char *diskIn return -1; } =20 - if (VIR_ALLOC(vol) < 0) - return -1; + vol =3D g_new0(virStorageVolDef, 1); =20 vol->name =3D g_strdup(diskInfo); =20 diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backen= d_zfs.c index dc692f47ed..4a89f98350 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -121,8 +121,7 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, volume =3D vol; =20 if (volume =3D=3D NULL) { - if (VIR_ALLOC(volume) < 0) - goto cleanup; + volume =3D g_new0(virStorageVolDef, 1); =20 is_new_vol =3D true; volume->type =3D VIR_STORAGE_VOL_BLOCK; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 9e79dbe1e4..16bc53aa46 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -265,8 +265,7 @@ storageStateInitialize(bool privileged, return -1; } =20 - if (VIR_ALLOC(driver) < 0) - return VIR_DRV_STATE_INIT_ERROR; + driver =3D g_new0(virStorageDriverState, 1); =20 driver->lockFD =3D -1; if (virMutexInit(&driver->lock) < 0) { @@ -1956,10 +1955,7 @@ storageVolCreateXML(virStoragePoolPtr pool, int buildret; virStorageVolDefPtr buildvoldef =3D NULL; =20 - if (VIR_ALLOC(buildvoldef) < 0) { - voldef =3D NULL; - goto cleanup; - } + buildvoldef =3D g_new0(virStorageVolDef, 1); =20 /* Make a shallow copy of the 'defined' volume definition, since t= he * original allocation value will change as the user polls 'info', @@ -2143,8 +2139,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr pool, * original allocation value will change as the user polls 'info', * but we only need the initial requested values */ - if (VIR_ALLOC(shadowvol) < 0) - goto cleanup; + shadowvol =3D g_new0(virStorageVolDef, 1); =20 memcpy(shadowvol, voldef, sizeof(*voldef)); =20 @@ -2428,8 +2423,7 @@ storageVolUpload(virStorageVolPtr vol, * interaction and we can just lookup the backend in the callback * routine in order to call the refresh API. */ - if (VIR_ALLOC(cbdata) < 0) - goto cleanup; + cbdata =3D g_new0(virStorageVolStreamInfo, 1); cbdata->pool_name =3D g_strdup(def->name); if (voldef->type =3D=3D VIR_STORAGE_VOL_PLOOP) cbdata->vol_path =3D g_strdup(voldef->target.path); diff --git a/src/storage/storage_file_fs.c b/src/storage/storage_file_fs.c index 8d9023bead..b379a8ca8e 100644 --- a/src/storage/storage_file_fs.c +++ b/src/storage/storage_file_fs.c @@ -73,8 +73,7 @@ virStorageFileBackendFileInit(virStorageSourcePtr src) src->path, (unsigned int)src->drv->uid, (unsigned int)src->drv->gid); =20 - if (VIR_ALLOC(priv) < 0) - return -1; + priv =3D g_new0(virStorageFileBackendFsPriv, 1); =20 src->drv->priv =3D priv; =20 diff --git a/src/storage/storage_file_gluster.c b/src/storage/storage_file_= gluster.c index 608f93d2f6..c84af8a4e8 100644 --- a/src/storage/storage_file_gluster.c +++ b/src/storage/storage_file_gluster.c @@ -109,8 +109,7 @@ virStorageFileBackendGlusterInit(virStorageSourcePtr sr= c) return -1; } =20 - if (VIR_ALLOC(priv) < 0) - return -1; + priv =3D g_new0(virStorageFileBackendGlusterPriv, 1); =20 VIR_DEBUG("initializing gluster storage file %p " "(priv=3D'%p' volume=3D'%s' path=3D'%s') as [%u:%u]", @@ -209,8 +208,7 @@ virStorageFileBackendGlusterRead(virStorageSourcePtr sr= c, } =20 =20 - if (VIR_ALLOC_N(*buf, len) < 0) - return -1; + *buf =3D g_new0(char, len); =20 s =3D *buf; while (len) { diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 7fc529046a..21ad54ac54 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -154,11 +154,9 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, if (wbytes < WRITE_BLOCK_SIZE_DEFAULT) wbytes =3D WRITE_BLOCK_SIZE_DEFAULT; =20 - if (VIR_ALLOC_N(zerobuf, wbytes) < 0) - return -errno; + zerobuf =3D g_new0(char, wbytes); =20 - if (VIR_ALLOC_N(buf, rbytes) < 0) - return -errno; + buf =3D g_new0(char, rbytes); =20 if (reflink_copy) { if (reflinkCloneFile(fd, inputfd) < 0) { @@ -1839,14 +1837,14 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageSo= urcePtr target, if (virStorageSourceUpdateBackingSizes(target, fd, sb) < 0) return -1; =20 - if (!target->perms && VIR_ALLOC(target->perms) < 0) - return -1; + if (!target->perms) + target->perms =3D g_new0(virStoragePerms, 1); target->perms->mode =3D sb->st_mode & S_IRWXUGO; target->perms->uid =3D sb->st_uid; target->perms->gid =3D sb->st_gid; =20 - if (!target->timestamps && VIR_ALLOC(target->timestamps) < 0) - return -1; + if (!target->timestamps) + target->timestamps =3D g_new0(virStorageTimestamps, 1); =20 #ifdef __APPLE__ target->timestamps->atime =3D sb->st_atimespec; @@ -2214,12 +2212,8 @@ storageBackendLoadDefaultSecrets(virStorageVolDefPtr= vol) if (!sec) return 0; =20 - if (VIR_ALLOC_N(vol->target.encryption->secrets, 1) < 0 || - VIR_ALLOC(encsec) < 0) { - VIR_FREE(vol->target.encryption->secrets); - virObjectUnref(sec); - return -1; - } + vol->target.encryption->secrets =3D g_new0(virStorageEncryptionSecretP= tr, 1); + encsec =3D g_new0(virStorageEncryptionSecret, 1); =20 vol->target.encryption->nsecrets =3D 1; vol->target.encryption->secrets[0] =3D encsec; @@ -2528,8 +2522,7 @@ storageBackendWipeLocal(const char *path, off_t size; g_autofree char *writebuf =3D NULL; =20 - if (VIR_ALLOC_N(writebuf, writebuf_length) < 0) - return -1; + writebuf =3D g_new0(char, writebuf_length); =20 if (!zero_end) { if ((size =3D lseek(fd, 0, SEEK_SET)) < 0) { @@ -2873,8 +2866,7 @@ virStorageUtilGlusterExtractPoolSources(const char *h= ost, goto cleanup; } =20 - if (VIR_ALLOC_N(src->hosts, 1) < 0) - goto cleanup; + src->hosts =3D g_new0(virStoragePoolSourceHost, 1); src->nhost =3D 1; =20 src->hosts[0].name =3D g_strdup(host); @@ -3535,8 +3527,7 @@ virStorageBackendRefreshLocal(virStoragePoolObjPtr po= ol) continue; } =20 - if (VIR_ALLOC(vol) < 0) - goto cleanup; + vol =3D g_new0(virStorageVolDef, 1); =20 vol->name =3D g_strdup(ent->d_name); =20 @@ -3671,8 +3662,7 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, return -1; } =20 - if (VIR_ALLOC(vol) < 0) - return -1; + vol =3D g_new0(virStorageVolDef, 1); =20 vol->type =3D VIR_STORAGE_VOL_BLOCK; =20 --=20 2.26.2