From nobody Mon Feb 9 09:57:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1585927031; cv=none; d=zohomail.com; s=zohoarc; b=YZ9brV5aMsIo+8q8WMZWyjJc3RNrFLPOx1+axDcPqNZBXA3Y/bZif0B6CcL/TN42u6wnQcEoFkmEtui2t6B1jDZxoHbrYGsjxROuJgkCanQb4Y7p4fTDEUMUIyn3HRpr2fsBRqQA7JwumvaQFx9XQagHjD9OhsgU21c7etlGPDo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585927031; h=Content-Type:Content-Transfer-Encoding:Cc: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=TYNfY+SXoIOen9HJAHHCs9cO4YdQ+ki0MenuVaiSkEA=; b=ieRZr8dXeDLITk8Cly7AE97wo8I9kDTdPxLtvIK8jJnSyju7MLgEsiFLc5iUA/OYNqfenlU/6YC2ZiTloERqDxWefHZQlA2F3DTDruCtmjZqgqP+tcvh/W+1nNNBAJiO+x/H+6yYS1vTdAP3vceSzORCT17gR5z091wOKWXoWaE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1585927031929893.4602059372322; Fri, 3 Apr 2020 08:17:11 -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-300-sQSqtVcsNZCIql87dt3daA-1; Fri, 03 Apr 2020 11:17:08 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5D20C1007269; Fri, 3 Apr 2020 15:17:00 +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 29C195C1D6; Fri, 3 Apr 2020 15:17:00 +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 B69E04E46F; Fri, 3 Apr 2020 15:16:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 033FGsZW028308 for ; Fri, 3 Apr 2020 11:16:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 717FA2028DCC; Fri, 3 Apr 2020 15:16:54 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6D27D2028CD6 for ; Fri, 3 Apr 2020 15:16:54 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4E84B1017E42 for ; Fri, 3 Apr 2020 15:16:54 +0000 (UTC) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-216-iYE2tZWiOvmt1Q48p6r9AA-1; Fri, 03 Apr 2020 11:16:51 -0400 Received: by mail-wr1-f51.google.com with SMTP id c7so8947091wrx.5 for ; Fri, 03 Apr 2020 08:16:51 -0700 (PDT) Received: from localhost.localdomain (public-gprs375156.centertel.pl. [37.47.96.181]) by smtp.gmail.com with ESMTPSA id p13sm12331045wru.3.2020.04.03.08.16.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 08:16:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585927030; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=TYNfY+SXoIOen9HJAHHCs9cO4YdQ+ki0MenuVaiSkEA=; b=RTfs05MwUJ9b/62TufmkiKOS5K/yVivxyhMQH8SBtRl+DXtFtzuR+5DyQK7B1RguRv2yA+ 93+Q3F7LpZZs79ch7f2NKqNurzdVEGvwGqBbMBnp7sl8i5cMWOK0pjdFLGKnDDsDJ6blmJ KBzS9Pq4gZAlwcFMuE/+oWLbboBUDSc= X-MC-Unique: sQSqtVcsNZCIql87dt3daA-1 X-MC-Unique: iYE2tZWiOvmt1Q48p6r9AA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tahiJXOAjk4YOfHSen3A5GMj6/N2dKYEe4w3brSnTNw=; b=ElvsqCkRlDMLfwOK9rL+wWXAbLtIIM7qkUjLgo7k4UEjjrN8BXJfBLI9Yox1RQvn9T dFVY0dBjeWcNiFhWD+IVASctYdsmnFdAJkRIwCKW3zwFLtysa9G33Z665xfl6enoVOW+ mnI+LqFDur6jlfw03Qx5mY/wonVviQlVWWDzhvurMqvO8JKUsySdW5RjDs1tMkkVa38o 540mz3/tobywx/8uJjNT9p1rbZfSW2CnMF+zyRvVF7jzc+vnB1NUul4GZ5k1DdqbQmT/ rzKCkEIMsZYdKTccMGdvNiGrHuQ9I/ACaxIwJR2n556yQdCDmUen5FUkdmuPBDCYwh8I dyTw== X-Gm-Message-State: AGi0PubTTEGYmplIzWBgABAgQE4/3bMVrWQyOGErQPNHViUI9QMbv5XJ VSVZ8aqKNfKxk/XbFW+31XHRoUC7S6E= X-Google-Smtp-Source: APiQypJYPdnntpkCtOE4GRs5yM9CUKBgVsyTvzAqd9dxSn7G+BOp+Q+w1EwQNyG7qE/ZiLOrEGQzwQ== X-Received: by 2002:adf:aacc:: with SMTP id i12mr10176039wrc.116.1585927010098; Fri, 03 Apr 2020 08:16:50 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH 23/36] datatypes: convert virStorageVol to GObject Date: Fri, 3 Apr 2020 17:15:51 +0200 Message-Id: <20200403151604.106616-24-r4f4rfs@gmail.com> In-Reply-To: <20200403151604.106616-1-r4f4rfs@gmail.com> References: <20200403151604.106616-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 033FGsZW028308 X-loop: libvir-list@redhat.com Cc: Rafael Fonseca 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.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Rafael Fonseca --- src/conf/virstorageobj.c | 8 +++++- src/datatypes.c | 48 ++++++++++++++++++++++-------------- src/datatypes.h | 15 +++++------ src/libvirt-storage.c | 6 ++--- src/libvirt_private.syms | 1 - src/qemu/qemu_migration.c | 3 +-- src/storage/storage_driver.c | 7 +++--- src/vz/vz_sdk.c | 19 ++++++-------- 8 files changed, 58 insertions(+), 49 deletions(-) diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index bff6eb6ae1..698fc25c5f 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1052,7 +1052,13 @@ virStoragePoolObjVolumeListExport(virConnectPtr conn, return data.nvols; =20 error: - virObjectListFree(data.vols); + if (data.vols) { + while (data.nvols--) { + if (data.vols[data.nvols]) + g_object_unref(data.vols[data.nvols]); + } + VIR_FREE(data.vols); + } return -1; } =20 diff --git a/src/datatypes.c b/src/datatypes.c index e434c31785..1f811e5f5e 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -39,7 +39,6 @@ virClassPtr virDomainClass; virClassPtr virNodeDeviceClass; virClassPtr virSecretClass; virClassPtr virStreamClass; -virClassPtr virStorageVolClass; =20 static void virConnectDispose(void *obj); static void virConnectCloseCallbackDataDispose(void *obj); @@ -47,7 +46,6 @@ static void virDomainDispose(void *obj); static void virNodeDeviceDispose(void *obj); static void virSecretDispose(void *obj); static void virStreamDispose(void *obj); -static void virStorageVolDispose(void *obj); =20 G_DEFINE_TYPE(virDomainCheckpoint, vir_domain_checkpoint, G_TYPE_OBJECT); static void virDomainCheckpointFinalize(GObject *obj); @@ -177,6 +175,22 @@ vir_storage_pool_class_init(virStoragePoolClass *klass) obj->finalize =3D virStoragePoolFinalize; } =20 +G_DEFINE_TYPE(virStorageVol, vir_storage_vol, G_TYPE_OBJECT); +static void virStorageVolFinalize(GObject *obj); + +static void +vir_storage_vol_init(virStorageVol *vol G_GNUC_UNUSED) +{ +} + +static void +vir_storage_vol_class_init(virStorageVolClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->finalize =3D virStorageVolFinalize; +} + virClassPtr virAdmConnectClass; virClassPtr virAdmConnectCloseCallbackDataClass; =20 @@ -232,7 +246,6 @@ virDataTypesOnceInit(void) DECLARE_CLASS(virNodeDevice); DECLARE_CLASS(virSecret); DECLARE_CLASS(virStream); - DECLARE_CLASS(virStorageVol); =20 DECLARE_CLASS_LOCKABLE(virAdmConnect); DECLARE_CLASS_LOCKABLE(virAdmConnectCloseCallbackData); @@ -713,7 +726,7 @@ virStoragePoolFinalize(GObject *obj) * @freeFunc: private data cleanup function pointer specific to driver * * Allocates a new storage volume object. When the object is no longer nee= ded, - * virObjectUnref() must be called in order to not leak data. + * g_object_unref() must be called in order to not leak data. * * Returns a pointer to the storage volume object, or NULL on error. */ @@ -721,18 +734,17 @@ virStorageVolPtr virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, const char *key, void *privateData, virFreeCallback freeF= unc) { - virStorageVolPtr ret =3D NULL; + g_autoptr(virStorageVol) ret =3D NULL; =20 if (virDataTypesInitialize() < 0) return NULL; =20 - virCheckConnectGoto(conn, error); - virCheckNonNullArgGoto(pool, error); - virCheckNonNullArgGoto(name, error); - virCheckNonNullArgGoto(key, error); + virCheckConnectReturn(conn, NULL); + virCheckNonNullArgReturn(pool, NULL); + virCheckNonNullArgReturn(name, NULL); + virCheckNonNullArgReturn(key, NULL); =20 - if (!(ret =3D virObjectNew(virStorageVolClass))) - goto error; + ret =3D VIR_STORAGE_VOL(g_object_new(VIR_TYPE_STORAGE_VOL, NULL)); =20 ret->pool =3D g_strdup(pool); ret->name =3D g_strdup(name); @@ -744,16 +756,12 @@ virGetStorageVol(virConnectPtr conn, const char *pool= , const char *name, ret->privateData =3D privateData; ret->privateDataFreeFunc =3D freeFunc; =20 - return ret; - - error: - virObjectUnref(ret); - return NULL; + return g_steal_pointer(&ret); } =20 =20 /** - * virStorageVolDispose: + * virStorageVolFinalize: * @obj: the storage volume to release * * Unconditionally release all memory associated with a volume. @@ -763,9 +771,9 @@ virGetStorageVol(virConnectPtr conn, const char *pool, = const char *name, * which may also be released if its ref count hits zero. */ static void -virStorageVolDispose(void *obj) +virStorageVolFinalize(GObject *obj) { - virStorageVolPtr vol =3D obj; + virStorageVolPtr vol =3D VIR_STORAGE_VOL(obj); VIR_DEBUG("release vol %p %s", vol, vol->name); =20 if (vol->privateDataFreeFunc) @@ -775,6 +783,8 @@ virStorageVolDispose(void *obj) VIR_FREE(vol->name); VIR_FREE(vol->pool); virObjectUnref(vol->conn); + + G_OBJECT_CLASS(vir_storage_vol_parent_class)->finalize(obj); } =20 =20 diff --git a/src/datatypes.h b/src/datatypes.h index a630472f6e..7fab565a7c 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -35,7 +35,6 @@ extern virClassPtr virDomainClass; extern virClassPtr virNodeDeviceClass; extern virClassPtr virSecretClass; extern virClassPtr virStreamClass; -extern virClassPtr virStorageVolClass; =20 =20 #define VIR_TYPE_DOMAIN_CHECKPOINT vir_domain_checkpoint_get_type() @@ -74,6 +73,9 @@ G_DECLARE_FINAL_TYPE(virNWFilterBinding, #define VIR_TYPE_STORAGE_POOL vir_storage_pool_get_type() G_DECLARE_FINAL_TYPE(virStoragePool, vir_storage_pool, VIR, STORAGE_POOL, = GObject); =20 +#define VIR_TYPE_STORAGE_VOL vir_storage_vol_get_type() +G_DECLARE_FINAL_TYPE(virStorageVol, vir_storage_vol, VIR, STORAGE_VOL, GOb= ject); + extern virClassPtr virAdmConnectClass; =20 #define VIR_TYPE_ADM_SERVER vir_adm_server_get_type() @@ -221,8 +223,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); =20 #define virCheckStorageVolReturn(obj, retval) \ do { \ - virStorageVolPtr _vol =3D (obj); \ - if (!virObjectIsClass(_vol, virStorageVolClass) || \ + virStorageVolPtr _vol =3D VIR_STORAGE_VOL(obj); \ + if (!G_IS_OBJECT(_vol) || !(G_OBJECT_TYPE(_vol) =3D=3D VIR_TYPE_ST= ORAGE_VOL) || \ !virObjectIsClass(_vol->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_STORAGE, \ VIR_ERR_INVALID_STORAGE_VOL, \ @@ -234,8 +236,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); } while (0) #define virCheckStorageVolGoto(obj, label) \ do { \ - virStorageVolPtr _vol =3D (obj); \ - if (!virObjectIsClass(_vol, virStorageVolClass) || \ + virStorageVolPtr _vol =3D VIR_STORAGE_VOL(obj); \ + if (!G_IS_OBJECT(_vol) || !(G_OBJECT_TYPE(_vol) =3D=3D VIR_TYPE_ST= ORAGE_VOL) || \ !virObjectIsClass(_vol->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_STORAGE, \ VIR_ERR_INVALID_STORAGE_VOL, \ @@ -707,7 +709,7 @@ struct _virStoragePool { * Internal structure associated to a storage volume */ struct _virStorageVol { - virObject parent; + GObject parent; virConnectPtr conn; /* pointer back to the connection= */ char *pool; /* Pool name of owner */ char *name; /* the storage vol external name = */ @@ -721,7 +723,6 @@ struct _virStorageVol { virFreeCallback privateDataFreeFunc; }; =20 -G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStorageVol, virObjectUnref); =20 =20 /** diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c index b88b2162de..53ad9eeec6 100644 --- a/src/libvirt-storage.c +++ b/src/libvirt-storage.c @@ -1884,7 +1884,7 @@ virStorageVolFree(virStorageVolPtr vol) =20 virCheckStorageVolReturn(vol, -1); =20 - virObjectUnref(vol); + g_object_unref(vol); return 0; } =20 @@ -1909,13 +1909,13 @@ virStorageVolFree(virStorageVolPtr vol) int virStorageVolRef(virStorageVolPtr vol) { - VIR_DEBUG("vol=3D%p refs=3D%d", vol, vol ? vol->parent.u.s.refs : 0); + VIR_DEBUG("vol=3D%p", vol); =20 virResetLastError(); =20 virCheckStorageVolReturn(vol, -1); =20 - virObjectRef(vol); + g_object_ref(vol); return 0; } =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f48ed05684..7bee97f2dc 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1367,7 +1367,6 @@ virGetStream; virNewConnectCloseCallbackData; virNodeDeviceClass; virSecretClass; -virStorageVolClass; virStreamClass; =20 =20 diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index de65c730f7..07e137e2c9 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -175,7 +175,7 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, { int ret =3D -1; g_autoptr(virStoragePool) pool =3D NULL; - virStorageVolPtr vol =3D NULL; + g_autoptr(virStorageVol) vol =3D NULL; char *volName =3D NULL, *basePath =3D NULL; char *volStr =3D NULL; virBuffer buf =3D VIR_BUFFER_INITIALIZER; @@ -268,7 +268,6 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, cleanup: VIR_FREE(basePath); VIR_FREE(volStr); - virObjectUnref(vol); return ret; } =20 diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 2db763caa5..8c0f7eae44 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1892,7 +1892,8 @@ storageVolCreateXML(virStoragePoolPtr pool, virStoragePoolObjPtr obj; virStoragePoolDefPtr def; virStorageBackendPtr backend; - virStorageVolPtr vol =3D NULL, newvol =3D NULL; + virStorageVolPtr vol =3D NULL; + g_autoptr(virStorageVol) newvol =3D NULL; g_autoptr(virStorageVolDef) voldef =3D NULL; =20 virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, NULL); @@ -2012,7 +2013,6 @@ storageVolCreateXML(virStoragePoolPtr pool, voldef =3D NULL; =20 cleanup: - virObjectUnref(newvol); virStoragePoolObjEndAPI(&obj); return vol; } @@ -2029,7 +2029,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr pool, virStorageBackendPtr backend; virStorageVolDefPtr voldefsrc =3D NULL; virStorageVolDefPtr shadowvol =3D NULL; - virStorageVolPtr newvol =3D NULL; + g_autoptr(virStorageVol) newvol =3D NULL; virStorageVolPtr vol =3D NULL; int buildret; g_autoptr(virStorageVolDef) voldef =3D NULL; @@ -2204,7 +2204,6 @@ storageVolCreateXMLFrom(virStoragePoolPtr pool, voldef =3D NULL; =20 cleanup: - virObjectUnref(newvol); VIR_FREE(shadowvol); virStoragePoolObjEndAPI(&obj); virStoragePoolObjEndAPI(&objsrc); diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index ed3d5ee2c0..17d8f9d94b 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -4082,9 +4082,8 @@ static int virStorageTranslatePoolLocal(virConnectPtr conn, virStorageSourcePtr src) { g_autoptr(virStoragePool) pool =3D NULL; - virStorageVolPtr vol =3D NULL; + g_autoptr(virStorageVol) vol =3D NULL; virStorageVolInfo info; - int ret =3D -1; =20 if (!(pool =3D virStoragePoolLookupByName(conn, src->srcpool->pool))) return -1; @@ -4093,30 +4092,26 @@ virStorageTranslatePoolLocal(virConnectPtr conn, vi= rStorageSourcePtr src) _("storage pool '%s' containing volume '%s' " "is not active"), src->srcpool->pool, src->srcpool->volume); - goto cleanup; + return -1; } =20 if (!(vol =3D virStorageVolLookupByName(pool, src->srcpool->volume))) - goto cleanup; + return -1; =20 if (virStorageVolGetInfo(vol, &info) < 0) - goto cleanup; + return -1; =20 if (info.type !=3D VIR_STORAGE_VOL_PLOOP) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported volume format '%s'"), virStorageVolTypeToString(info.type)); - goto cleanup; + return -1; } =20 if (!(src->path =3D virStorageVolGetPath(vol))) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - virObjectUnref(vol); - return ret; + return 0; } =20 =20 --=20 2.25.1