From nobody Mon Feb 9 13:57:22 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=1589371141; cv=none; d=zohomail.com; s=zohoarc; b=i1v+ZRZzVGXsHXK2cBqssBwQrvSJMzzMu8nQ0s40uYXjnpxwfgat4elXDO3IZp6qLPGIVIklYZy+GOo+rp9I0VGDvlVLzS/2yjJeh7FXgP3XuiLmzu7aAkpDm1RGS+Mo2TdPZycW6yBvkUWtn1N3KbCofjTeXq8H4yxAml3QQ8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589371141; 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=OoZx/W+qn6Y7U32gTkzAlIW4vAlpRiPE6xMGiDy9BDo=; b=aDPRWs7rifHHFoJ8//GdPnmY82gUo2Rj/pR7BNM1/zslpid9vgB98xs4HzQrrF04LGGO63XfsPm8u0mAO3G52zU20r8hpxxF7kg7FvWOhjlHKoy6QjnCZnNXfstA+y62pWWLujWYS5389o+TZg6H04zQzyWvEg0XMFVblnaZ0Ec= 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 1589371141046942.2587676035835; Wed, 13 May 2020 04:59:01 -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-284-cXzGpcLENreYLhP0RhuqLA-1; Wed, 13 May 2020 07:58:56 -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 1A92784E279; Wed, 13 May 2020 11:58:51 +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 E6EA560CD3; Wed, 13 May 2020 11:58:50 +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 B444D4E9F9; Wed, 13 May 2020 11:58:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04DBwllL016251 for ; Wed, 13 May 2020 07:58:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id CFDDC2156A2D; Wed, 13 May 2020 11:58:47 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CA75C2166B27 for ; Wed, 13 May 2020 11:58:47 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (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 A0CFC1859163 for ; Wed, 13 May 2020 11:58:47 +0000 (UTC) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-223-4NymmTrDNvGocP6c9p3PjA-1; Wed, 13 May 2020 07:58:45 -0400 Received: by mail-wr1-f53.google.com with SMTP id l17so6982915wrr.4 for ; Wed, 13 May 2020 04:58:45 -0700 (PDT) Received: from localhost.localdomain (public-gprs367127.centertel.pl. [37.47.65.88]) by smtp.gmail.com with ESMTPSA id l1sm27838422wrc.24.2020.05.13.04.58.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2020 04:58:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589371139; 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=OoZx/W+qn6Y7U32gTkzAlIW4vAlpRiPE6xMGiDy9BDo=; b=IyDJ4l9KdJR+7tm4mlAotrxKRnMCQJXcr7psK3Idh38+N7hGlRCvAc8xEPKqman3IwxzIp 5h8i4CnHml3WUvGf1Zk0D5rQLepUEUhnT7FNlej+ds6DAFzoK2nDDkaZSW7HPJuaWipC/7 IKUdKCUB/LHLbQNmokvv2Zqz7zuSntY= X-MC-Unique: cXzGpcLENreYLhP0RhuqLA-1 X-MC-Unique: 4NymmTrDNvGocP6c9p3PjA-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=OoZx/W+qn6Y7U32gTkzAlIW4vAlpRiPE6xMGiDy9BDo=; b=Ol3cITQ23m1PwytM68RjfbanoiMRKM7YBLg+kCIqx+noIK1gNPVf2GrqrRglfrhUop OHb6CIDMwyYxbYoJ159OOJvBUHDJugOc+OHzGp2F+49RaeGfBKNQANoczyQUE2TvPxMa y2dV5rNt3u1rijrNvQAXVao2Ogd7EDrn0OXCMpgrYmkvVZpgAUTvoWuMlCl2RUzDr0zK OvrFKWa+jGYBWyohFUqKkIHzlE7UofrHWl0fsMj9E0RELCltC7WqhDb89amrMhn4crSk ugNH3DsLHPpJBv1bct744zABtcIIvDdCwGai0RBDaK5Mkh1YFnskM0KNya+hvUtAbr7Z fiag== X-Gm-Message-State: AGi0Puam3KarfZQcMTlXls9yon6BXXUZaTznbDq7iw72+fW252vBzml1 Jcdzw/XGypm6jhVs7+SVgwTPeeuy X-Google-Smtp-Source: APiQypJzqebJxCNdO9JrBH85RyON9L5D+aaRorhn9Qlosq2ZiZSjzLihdsNk+8MCoyJP2L5V93b32w== X-Received: by 2002:a5d:54c4:: with SMTP id x4mr32571579wrv.73.1589371123620; Wed, 13 May 2020 04:58:43 -0700 (PDT) From: Rafael Fonseca To: libvirt-list@redhat.com Subject: [PATCH 27/40] datatypes: convert virSecret to GObject Date: Wed, 13 May 2020 13:57:11 +0200 Message-Id: <20200513115724.157687-28-r4f4rfs@gmail.com> In-Reply-To: <20200513115724.157687-1-r4f4rfs@gmail.com> References: <20200513115724.157687-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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/secret_event.c | 15 ++++------ src/conf/virsecretobj.c | 2 +- src/datatypes.c | 44 ++++++++++++++++++----------- src/datatypes.h | 14 +++++---- src/libvirt-secret.c | 7 ++--- src/libvirt_private.syms | 2 +- src/remote/remote_daemon_dispatch.c | 6 ++-- src/remote/remote_driver.c | 6 ++-- src/rpc/gendispatch.pl | 1 + src/storage/storage_util.c | 4 +-- src/util/virsecret.c | 3 +- 11 files changed, 53 insertions(+), 51 deletions(-) diff --git a/src/conf/secret_event.c b/src/conf/secret_event.c index 1c34dcfbc9..96fdcc3577 100644 --- a/src/conf/secret_event.c +++ b/src/conf/secret_event.c @@ -109,10 +109,10 @@ virSecretEventDispatchDefaultFunc(virConnectPtr conn, virConnectObjectEventGenericCallback cb, void *cbopaque) { - virSecretPtr secret =3D virGetSecret(conn, - event->meta.uuid, - event->meta.id, - event->meta.name); + g_autoptr(virSecret) secret =3D virGetSecret(conn, + event->meta.uuid, + event->meta.id, + event->meta.name); =20 if (!secret) return; @@ -127,23 +127,20 @@ virSecretEventDispatchDefaultFunc(virConnectPtr conn, secretLifecycleEv= ent->type, secretLifecycleEv= ent->detail, cbopaque); - goto cleanup; + return; } =20 case VIR_SECRET_EVENT_ID_VALUE_CHANGED: { ((virConnectSecretEventGenericCallback)cb)(conn, secret, cbopaque); - goto cleanup; + return; } =20 case VIR_SECRET_EVENT_ID_LAST: break; } VIR_WARN("Unexpected event ID %d", event->eventID); - - cleanup: - virObjectUnref(secret); } =20 =20 diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 81c9f2c346..3905fc0f9b 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -611,7 +611,7 @@ virSecretObjListExport(virConnectPtr conn, return data.nsecrets; =20 error: - virObjectListFree(data.secrets); + virGObjectListFreeCount(data.secrets, data.nsecrets); return -1; } =20 diff --git a/src/datatypes.c b/src/datatypes.c index 29a7177780..b98db8721f 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -36,13 +36,11 @@ VIR_LOG_INIT("datatypes"); virClassPtr virConnectClass; virClassPtr virConnectCloseCallbackDataClass; virClassPtr virDomainClass; -virClassPtr virSecretClass; virClassPtr virStreamClass; =20 static void virConnectDispose(void *obj); static void virConnectCloseCallbackDataDispose(void *obj); static void virDomainDispose(void *obj); -static void virSecretDispose(void *obj); static void virStreamDispose(void *obj); =20 G_DEFINE_TYPE(virDomainCheckpoint, vir_domain_checkpoint, G_TYPE_OBJECT); @@ -173,6 +171,22 @@ vir_nw_filter_binding_class_init(virNWFilterBindingCla= ss *klass) obj->finalize =3D virNWFilterBindingFinalize; } =20 +G_DEFINE_TYPE(virSecret, vir_secret, G_TYPE_OBJECT); +static void virSecretFinalize(GObject *obj); + +static void +vir_secret_init(virSecret *sec G_GNUC_UNUSED) +{ +} + +static void +vir_secret_class_init(virSecretClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->finalize =3D virSecretFinalize; +} + G_DEFINE_TYPE(virStoragePool, vir_storage_pool, G_TYPE_OBJECT); static void virStoragePoolFinalize(GObject *obj); =20 @@ -257,7 +271,6 @@ virDataTypesOnceInit(void) DECLARE_CLASS_LOCKABLE(virConnect); DECLARE_CLASS_LOCKABLE(virConnectCloseCallbackData); DECLARE_CLASS(virDomain); - DECLARE_CLASS(virSecret); DECLARE_CLASS(virStream); =20 DECLARE_CLASS_LOCKABLE(virAdmConnect); @@ -859,7 +872,7 @@ virNodeDeviceFinalize(GObject *obj) * @uuid: secret UUID * * Allocates a new secret object. When the object is no longer needed, - * 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 secret object, or NULL on error. */ @@ -867,16 +880,15 @@ virSecretPtr virGetSecret(virConnectPtr conn, const unsigned char *uuid, int usageType, const char *usageID) { - virSecretPtr ret =3D NULL; + g_autoptr(virSecret) ret =3D NULL; =20 if (virDataTypesInitialize() < 0) return NULL; =20 - virCheckConnectGoto(conn, error); - virCheckNonNullArgGoto(uuid, error); + virCheckConnectReturn(conn, NULL); + virCheckNonNullArgReturn(uuid, NULL); =20 - if (!(ret =3D virObjectNew(virSecretClass))) - return NULL; + ret =3D VIR_SECRET(g_object_new(VIR_TYPE_SECRET, NULL)); =20 memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); ret->usageType =3D usageType; @@ -884,15 +896,11 @@ virGetSecret(virConnectPtr conn, const unsigned char = *uuid, =20 ret->conn =3D virObjectRef(conn); =20 - return ret; - - error: - virObjectUnref(ret); - return NULL; + return g_steal_pointer(&ret); } =20 /** - * virSecretDispose: + * virSecretFinalize: * @obj: the secret to release * * Unconditionally release all memory associated with a secret. @@ -902,9 +910,9 @@ virGetSecret(virConnectPtr conn, const unsigned char *u= uid, * which may also be released if its ref count hits zero. */ static void -virSecretDispose(void *obj) +virSecretFinalize(GObject *obj) { - virSecretPtr secret =3D obj; + virSecretPtr secret =3D VIR_SECRET(obj); char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 virUUIDFormat(secret->uuid, uuidstr); @@ -912,6 +920,8 @@ virSecretDispose(void *obj) =20 VIR_FREE(secret->usageID); virObjectUnref(secret->conn); + + G_OBJECT_CLASS(vir_secret_parent_class)->finalize(obj); } =20 =20 diff --git a/src/datatypes.h b/src/datatypes.h index cbf565097f..2f97268691 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -32,7 +32,6 @@ =20 extern virClassPtr virConnectClass; extern virClassPtr virDomainClass; -extern virClassPtr virSecretClass; extern virClassPtr virStreamClass; =20 #define VIR_TYPE_DOMAIN_CHECKPOINT vir_domain_checkpoint_get_type() @@ -71,6 +70,9 @@ G_DECLARE_FINAL_TYPE(virNWFilterBinding, NW_FILTER_BINDING, GObject); =20 +#define VIR_TYPE_SECRET vir_secret_get_type() +G_DECLARE_FINAL_TYPE(virSecret, vir_secret, VIR, SECRET, GObject); + #define VIR_TYPE_STORAGE_POOL vir_storage_pool_get_type() G_DECLARE_FINAL_TYPE(virStoragePool, vir_storage_pool, VIR, STORAGE_POOL, = GObject); =20 @@ -277,8 +279,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); =20 #define virCheckSecretReturn(obj, retval) \ do { \ - virSecretPtr _secret =3D (obj); \ - if (!virObjectIsClass(_secret, virSecretClass) || \ + virSecretPtr _secret =3D VIR_SECRET(obj); \ + if (_secret =3D=3D NULL || \ !virObjectIsClass(_secret->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_SECRET, \ VIR_ERR_INVALID_SECRET, \ @@ -291,8 +293,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); =20 #define virCheckSecretGoto(obj, label) \ do { \ - virSecretPtr _secret =3D (obj); \ - if (!virObjectIsClass(_secret, virSecretClass) || \ + virSecretPtr _secret =3D VIR_SECRET(obj); \ + if (_secret =3D=3D NULL || \ !virObjectIsClass(_secret->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_SECRET, \ VIR_ERR_INVALID_SECRET, \ @@ -744,7 +746,7 @@ struct _virNodeDevice { * Internal structure associated with a secret */ struct _virSecret { - virObject parent; + GObject parent; virConnectPtr conn; /* pointer back to the connection= */ unsigned char uuid[VIR_UUID_BUFLEN]; /* the secret unique identifier */ int usageType; /* the type of usage */ diff --git a/src/libvirt-secret.c b/src/libvirt-secret.c index 33cbdd7b0b..4248536a5b 100644 --- a/src/libvirt-secret.c +++ b/src/libvirt-secret.c @@ -658,14 +658,13 @@ virSecretUndefine(virSecretPtr secret) int virSecretRef(virSecretPtr secret) { - VIR_DEBUG("secret=3D%p refs=3D%d", secret, - secret ? secret->parent.u.s.refs : 0); + VIR_DEBUG("secret=3D%p", secret); =20 virResetLastError(); =20 virCheckSecretReturn(secret, -1); =20 - virObjectRef(secret); + g_object_ref(secret); return 0; } =20 @@ -687,7 +686,7 @@ virSecretFree(virSecretPtr secret) =20 virCheckSecretReturn(secret, -1); =20 - virObjectUnref(secret); + g_object_unref(secret); return 0; } =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fc0a23508b..7a1e7b60dc 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1364,6 +1364,7 @@ vir_network_port_get_type; vir_node_device_get_type; vir_nw_filter_binding_get_type; vir_nw_filter_get_type; +vir_secret_get_type; vir_storage_pool_get_type; vir_storage_vol_get_type; virConnectClass; @@ -1388,7 +1389,6 @@ virGetStoragePool; virGetStorageVol; virGetStream; virNewConnectCloseCallbackData; -virSecretClass; virStreamClass; =20 =20 diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index f259909533..427cede17e 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -4382,7 +4382,7 @@ remoteDispatchSecretGetValue(virNetServerPtr server G= _GNUC_UNUSED, remote_secret_get_value_args *args, remote_secret_get_value_ret *ret) { - virSecretPtr secret =3D NULL; + g_autoptr(virSecret) secret =3D NULL; size_t value_size; unsigned char *value; int rv =3D -1; @@ -4405,7 +4405,6 @@ remoteDispatchSecretGetValue(virNetServerPtr server G= _GNUC_UNUSED, cleanup: if (rv < 0) virNetMessageSaveError(rerr); - virObjectUnref(secret); return rv; } =20 @@ -6375,7 +6374,7 @@ remoteDispatchConnectSecretEventRegisterAny(virNetSer= verPtr server G_GNUC_UNUSED daemonClientEventCallbackPtr ref; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); - virSecretPtr secret =3D NULL; + g_autoptr(virSecret) secret =3D NULL; virConnectPtr conn =3D remoteGetSecretConn(client); =20 virMutexLock(&priv->lock); @@ -6433,7 +6432,6 @@ remoteDispatchConnectSecretEventRegisterAny(virNetSer= verPtr server G_GNUC_UNUSED remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); - virObjectUnref(secret); return rv; } =20 diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 9b22953061..c108b56c34 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5559,7 +5559,7 @@ remoteSecretBuildEventLifecycle(virNetClientProgramPt= r prog G_GNUC_UNUSED, virConnectPtr conn =3D opaque; struct private_data *priv =3D conn->privateData; remote_secret_event_lifecycle_msg *msg =3D evdata; - virSecretPtr secret; + g_autoptr(virSecret) secret =3D NULL; virObjectEventPtr event =3D NULL; =20 secret =3D get_nonnull_secret(conn, msg->secret); @@ -5568,7 +5568,6 @@ remoteSecretBuildEventLifecycle(virNetClientProgramPt= r prog G_GNUC_UNUSED, =20 event =3D virSecretEventLifecycleNew(secret->uuid, secret->usageType, = secret->usageID, msg->event, msg->detail); - virObjectUnref(secret); =20 virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } @@ -5581,7 +5580,7 @@ remoteSecretBuildEventValueChanged(virNetClientProgra= mPtr prog G_GNUC_UNUSED, virConnectPtr conn =3D opaque; struct private_data *priv =3D conn->privateData; remote_secret_event_value_changed_msg *msg =3D evdata; - virSecretPtr secret; + g_autoptr(virSecret) secret =3D NULL; virObjectEventPtr event =3D NULL; =20 secret =3D get_nonnull_secret(conn, msg->secret); @@ -5589,7 +5588,6 @@ remoteSecretBuildEventValueChanged(virNetClientProgra= mPtr prog G_GNUC_UNUSED, return; =20 event =3D virSecretEventValueChangedNew(secret->uuid, secret->usageTyp= e, secret->usageID); - virObjectUnref(secret); =20 virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 6869311f06..902ff091a5 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -204,6 +204,7 @@ my %gobject_impl =3D ( virNodeDevice =3D> 1, virNWFilter =3D> 1, virNWFilterBinding =3D> 1, + virSecret =3D> 1, virStoragePool =3D> 1, virStorageVol =3D> 1, ); diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 1ec1d13625..7e3bfd1393 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2172,7 +2172,7 @@ virStorageBackendVolDeleteLocal(virStoragePoolObjPtr = pool G_GNUC_UNUSED, static int storageBackendLoadDefaultSecrets(virStorageVolDefPtr vol) { - virSecretPtr sec; + g_autoptr(virSecret) sec =3D NULL; virStorageEncryptionSecretPtr encsec =3D NULL; virConnectPtr conn =3D NULL; =20 @@ -2199,7 +2199,6 @@ storageBackendLoadDefaultSecrets(virStorageVolDefPtr = vol) if (VIR_ALLOC_N(vol->target.encryption->secrets, 1) < 0 || VIR_ALLOC(encsec) < 0) { VIR_FREE(vol->target.encryption->secrets); - virObjectUnref(sec); return -1; } =20 @@ -2209,7 +2208,6 @@ storageBackendLoadDefaultSecrets(virStorageVolDefPtr = vol) encsec->type =3D VIR_STORAGE_ENCRYPTION_SECRET_TYPE_PASSPHRASE; encsec->seclookupdef.type =3D VIR_SECRET_LOOKUP_TYPE_UUID; virSecretGetUUID(sec, encsec->seclookupdef.u.uuid); - virObjectUnref(sec); =20 return 0; } diff --git a/src/util/virsecret.c b/src/util/virsecret.c index 54d6bbcb7c..7279d22683 100644 --- a/src/util/virsecret.c +++ b/src/util/virsecret.c @@ -147,7 +147,7 @@ virSecretGetSecretString(virConnectPtr conn, uint8_t **secret, size_t *secret_size) { - virSecretPtr sec =3D NULL; + g_autoptr(virSecret) sec =3D NULL; int ret =3D -1; =20 switch (seclookupdef->type) { @@ -190,6 +190,5 @@ virSecretGetSecretString(virConnectPtr conn, ret =3D 0; =20 cleanup: - virObjectUnref(sec); return ret; } --=20 2.26.2