From nobody Fri Dec 19 20:15:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=1587477266; cv=none; d=zohomail.com; s=zohoarc; b=NmRL+c2Tp2JlSoTiVseo0swxW4aaOYQmD4ZnMUb1Q/Vgp+zCd2N44CCSElMlPqvSpFQ6mSJwJyPVrGVBBu7Kgh5Zvde93Il8jAyYadqGkcAldqvqB50VTqYFxPDfPWPFHN+i1C9Ai5dXkSAWv5cv59hwQWCjSj+RF2Sxp3vbQO0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587477266; 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=05kticGKjZPEQxkbUp+gMCi8NyFceZuYFWExd5i1kx4=; b=WG86Xb3Fps//qCq5Y0MfWN81wHlmoPiezo2wC/Ap+w7NoPUpwEN0wrZUCgObEKSOEqvzyHtJq9jYKXuPcVPOJiEnsfkKxt0Z01hLK6UFnGI4G8AsDnYJgvb7AN8KqQZH0UZCRCi2Ktb4ikY3OETA17QvO7Qa+6byZf20gXFvm5k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1587477266239877.8088233373733; Tue, 21 Apr 2020 06:54:26 -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-495-juMa6x23N--Ab1-_m5Tz4w-1; Tue, 21 Apr 2020 09:54:21 -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 1A31E107ACC4; Tue, 21 Apr 2020 13:54:16 +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 DD75460C87; Tue, 21 Apr 2020 13:54:15 +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 8A7091819ACE; Tue, 21 Apr 2020 13:54:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03LDqoJ8003924 for ; Tue, 21 Apr 2020 09:52:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 990AEA18B1; Tue, 21 Apr 2020 13:52:50 +0000 (UTC) Received: from mimecast-mx01.redhat.com (mimecast03.extmail.prod.ext.phx2.redhat.com [10.5.110.60]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 922E4A18B4 for ; Tue, 21 Apr 2020 13:52:48 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 963D21B2C981 for ; Tue, 21 Apr 2020 13:52:47 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-188-5pGDaGAkNOaZnPE2JukDWA-1; Tue, 21 Apr 2020 09:50:36 -0400 Received: by mail-wm1-f52.google.com with SMTP id 188so3653983wmc.2 for ; Tue, 21 Apr 2020 06:50:36 -0700 (PDT) Received: from localhost.localdomain (public-gprs377075.centertel.pl. [37.47.104.52]) by smtp.gmail.com with ESMTPSA id q10sm3981826wrv.95.2020.04.21.06.50.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 06:50:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587477263; 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=05kticGKjZPEQxkbUp+gMCi8NyFceZuYFWExd5i1kx4=; b=R/VYDsUFwSkJfdpHvN9cTXTwbJKJTKqlvVYH4csIBr8YPA/sMw3on1R/LqnBlglJ4SBS4e aCp7w2gl0K87OCENygvlOZe3ed+OkdQgt48k1zoYEUL6mlQvP7yF83f55P5Y1Gvbp6Gqn7 UWp1N3Hl5xQVYceWGou4BcdxykLgnOo= X-MC-Unique: juMa6x23N--Ab1-_m5Tz4w-1 X-MC-Unique: 5pGDaGAkNOaZnPE2JukDWA-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=0RdD6RcjFohkq2IIpcmOXjvn7W7UFeAkd7ZmO2iWhnI=; b=g1SCDhujw7hT5QN/IWLoQx4LUlfOaQB4G+mC7wiXAvxzKWIbzlEu0FOLGdlvnvM5M9 VvIMs+uzIkRkpaHFpSe8VWc8mBkM8C4vEvZ4cw3DAfDkfVhdEsBArAUiJN0wXBEcXdcf yJ0keJoY+gWv7zZN8TOpxKFw3D3yqHx48pt48r9q80aGuzgka4id2BGhKLfdb1mH3F1n 4K4keitCTnmd4aK1hqJEKJp4dturkLNuBrSCNOQm1UyQE3VGB6WLjGmuQa8Btid9cVfP 59yKsT56Koyb2DiJvJBkGBUPq3tK+G45AQq6WhstVw/SznmJXiI5EVGm1hQYI2j/GqLU ATmw== X-Gm-Message-State: AGi0PuY6H2csEn/aaxuJ+vmPmwTT541ILQfZxq4QBNC8Se9vQq6libkF amEXqmFnAPRV49nCEnwP8QF2xSByhao= X-Google-Smtp-Source: APiQypJTUn6cRfN+lgE+kiufyxfjRxLN147PjEVf318E7eGH0qcv69IeG2Pgvx43TCgu2lwSbNTulQ== X-Received: by 2002:a7b:c5d8:: with SMTP id n24mr4935650wmk.158.1587477034384; Tue, 21 Apr 2020 06:50:34 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH v2 25/40] datatypes: convert virStorageVol to GObject Date: Tue, 21 Apr 2020 15:49:06 +0200 Message-Id: <20200421134921.3717019-26-r4f4rfs@gmail.com> In-Reply-To: <20200421134921.3717019-1-r4f4rfs@gmail.com> References: <20200421134921.3717019-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 03LDqoJ8003924 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.12 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 | 2 +- src/datatypes.c | 72 ++++++++++++++++++++++++------------ src/datatypes.h | 15 ++++---- src/libvirt-storage.c | 6 +-- src/libvirt_private.syms | 2 +- src/qemu/qemu_migration.c | 3 +- src/rpc/gendispatch.pl | 1 + src/storage/storage_driver.c | 7 ++-- src/vz/vz_sdk.c | 19 ++++------ 9 files changed, 74 insertions(+), 53 deletions(-) diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 4c25c9a9f8..d4ea1df81d 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1052,7 +1052,7 @@ virStoragePoolObjVolumeListExport(virConnectPtr conn, return data.nvols; =20 error: - virObjectListFree(data.vols); + virGObjectListFreeCount(data.vols, data.nvols); return -1; } =20 diff --git a/src/datatypes.c b/src/datatypes.c index a9a942b3a6..66d4f478ab 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 virDomainCheckpointDispose(GObject *obj); @@ -193,6 +191,24 @@ vir_storage_pool_class_init(virStoragePoolClass *klass) obj->finalize =3D virStoragePoolFinalize; } =20 +G_DEFINE_TYPE(virStorageVol, vir_storage_vol, G_TYPE_OBJECT); +static void virStorageVolDispose(GObject *obj); +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->dispose =3D virStorageVolDispose; + obj->finalize =3D virStorageVolFinalize; +} + virClassPtr virAdmConnectClass; virClassPtr virAdmConnectCloseCallbackDataClass; =20 @@ -250,7 +266,6 @@ virDataTypesOnceInit(void) DECLARE_CLASS(virNodeDevice); DECLARE_CLASS(virSecret); DECLARE_CLASS(virStream); - DECLARE_CLASS(virStorageVol); =20 DECLARE_CLASS_LOCKABLE(virAdmConnect); DECLARE_CLASS_LOCKABLE(virAdmConnectCloseCallbackData); @@ -782,7 +797,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. */ @@ -790,18 +805,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); @@ -813,11 +827,7 @@ 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 @@ -825,16 +835,31 @@ virGetStorageVol(virConnectPtr conn, const char *pool= , const char *name, * virStorageVolDispose: * @obj: the storage volume to release * - * Unconditionally release all memory associated with a volume. - * The volume object must not be used once this method returns. + * Unreferences the associated connection object, which may also be + * released if its ref count hits zero. + */ +static void +virStorageVolDispose(GObject *obj) +{ + virStorageVolPtr vol =3D VIR_STORAGE_VOL(obj); + + virObjectUnref(vol->conn); + vol->conn =3D NULL; + + G_OBJECT_CLASS(vir_storage_vol_parent_class)->dispose(obj); +} + +/** + * virStorageVolFinalize: + * @obj: the storage volume to release * - * It will also unreference the associated connection object, - * which may also be released if its ref count hits zero. + * Unconditionally releases all memory associated with a volume. + * The volume object must not be used once this method returns. */ 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) @@ -843,7 +868,8 @@ virStorageVolDispose(void *obj) VIR_FREE(vol->key); 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 2c8256388c..5492c2ac8a 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 #define VIR_TYPE_DOMAIN_CHECKPOINT vir_domain_checkpoint_get_type() G_DECLARE_FINAL_TYPE(virDomainCheckpoint, @@ -73,6 +72,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() @@ -220,8 +222,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 (_vol =3D=3D NULL || \ !virObjectIsClass(_vol->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_STORAGE, \ VIR_ERR_INVALID_STORAGE_VOL, \ @@ -233,8 +235,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 (_vol =3D=3D NULL || \ !virObjectIsClass(_vol->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_STORAGE, \ VIR_ERR_INVALID_STORAGE_VOL, \ @@ -706,7 +708,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 = */ @@ -720,7 +722,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 94009505bc..9e559ad1f8 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1354,6 +1354,7 @@ vir_network_port_get_type; vir_nw_filter_binding_get_type; vir_nw_filter_get_type; vir_storage_pool_get_type; +vir_storage_vol_get_type; virConnectClass; virConnectCloseCallbackDataCall; virConnectCloseCallbackDataClass; @@ -1378,7 +1379,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/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 8d19651367..1cfafe3742 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -204,6 +204,7 @@ my %gobject_impl =3D ( virNWFilter =3D> 1, virNWFilterBinding =3D> 1, virStoragePool =3D> 1, + virStorageVol =3D> 1, ); =20 sub use_gobject { 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.3