From nobody Fri Dec 19 20:15:46 2025 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=1587477078; cv=none; d=zohomail.com; s=zohoarc; b=kFQesR/pgv4ISvcjtzJXnUVpdH/vVU5l/pt+HcpexdQFvx7XWX0tXSncmq35iGYrnsDiXpiECiYgd46wMc1AkQQWi5arjoPhL6En/2T9I3a0tgpYJeTY1/gt2m8YxJLKizuCgL4+/K3FFK3N7r6PJmihhPuCTAsYhxrRgBbn9us= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587477078; 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=NVfkhM0NvjK9ttTNvnaxqnp8Mf2hX0gxvTo4jG3GGhs=; b=YPTAenk8KswmS1Y/T4Mxs2mr0FzqQnSwkoxsjuN/ITaoncDPE3wG2yDfnj8e+EuAwcKwlHorUJqYs7mbC9a00+mNxRGD5BUQZ/ZLEFtsYFIvff0HpY+Inpw316vd9oIi0IPnz6p9JgzSkFEoYtrIHodBGcDWVPBQjwaS3ixnt98= 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 158747707860151.290099519292085; Tue, 21 Apr 2020 06:51:18 -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-396-9Mzlxn6TPKWh2tQBvNKgng-1; Tue, 21 Apr 2020 09:51:12 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 28D25149C4; Tue, 21 Apr 2020 13:51:05 +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 EEC77A18A1; Tue, 21 Apr 2020 13:51:04 +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 93608941D7; Tue, 21 Apr 2020 13:51:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03LDoijM003518 for ; Tue, 21 Apr 2020 09:50:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 385D05DA7C; Tue, 21 Apr 2020 13:50:44 +0000 (UTC) Received: from mimecast-mx01.redhat.com (mimecast04.extmail.prod.ext.phx2.redhat.com [10.5.110.61]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2FC6C5DA88 for ; Tue, 21 Apr 2020 13:50:37 +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-mx01.redhat.com (Postfix) with ESMTPS id 4A7D0149C4 for ; Tue, 21 Apr 2020 13:50:37 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-350-4MN6vFhPPe6Emncl5tmysw-1; Tue, 21 Apr 2020 09:50:34 -0400 Received: by mail-wm1-f50.google.com with SMTP id u127so3777946wmg.1 for ; Tue, 21 Apr 2020 06:50:34 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 06:50:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587477077; 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=NVfkhM0NvjK9ttTNvnaxqnp8Mf2hX0gxvTo4jG3GGhs=; b=NbpaSyLak/oTGB1oP4k6HAQqs2VtxB3KIws6zD3ISaBMFVUDma95eJZWmMTlbAASlZVQLu asA79IS277yBAAfmpB35HlVOfoN9Mjxg5Ho3wPzu/y0BT347ATCL3WxHmZiaKMHV9AZWqC CfJT5uus2V2Ziaq23GLqNDGCRLKKUqg= X-MC-Unique: 9Mzlxn6TPKWh2tQBvNKgng-1 X-MC-Unique: 4MN6vFhPPe6Emncl5tmysw-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=Exvu1/HZixClOv9QsBtO3dK1P/Viu26v1sa/um4+kj8=; b=cthiFfsOkdEhxb0jG8e98LreD+6LAgc6xo1GtWT+a/6sxypz5R6+422Z5UW1ltPbfq nYLRMiZzIBJ2XKO1GFB8/v0pKG0tPlkWvgv7T41dLXtrvIznS3nvlQX3HhBJL32qVU5e sdWyiW5WYPBAdhmG7w0yLO2BQrZny1hFm5PB+YRHBM4UfWpf2S62zFEIjIhTIV1Dn34f Iw6Mr3iL4o9eGaknjDqpq6lNwA8p6p2YT8HezBputaYALABL1IeONalTuQPIPK3E0KCX qcsEgBVUex6b8VOtnIz2TFhbbx35W3Ktzhxoy9cHoSMXFBH+OxGija7QMwBpxoOAqA1q UQ2A== X-Gm-Message-State: AGi0Pubhodsj3osaK1EiQoYSwmZTmiwFjhoKwRPjDfsPu2Vqskq6bmD4 +biAxW5vn3ExLCeHlU4APNLC4N0l+C0= X-Google-Smtp-Source: APiQypKEF5W7/sNGo7f3K25lN1N79y7hqWpNWYwrH9I6WXcIBIfiFpJ+WrN0NAMHa8Ds1IDS84/Pyg== X-Received: by 2002:a1c:5fc4:: with SMTP id t187mr5258983wmb.181.1587477032460; Tue, 21 Apr 2020 06:50:32 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH v2 24/40] datatypes: convert virStoragePool to GObject Date: Tue, 21 Apr 2020 15:49:05 +0200 Message-Id: <20200421134921.3717019-25-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.14 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 03LDoijM003518 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.13 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/storage_event.c | 15 +++---- src/conf/virstorageobj.c | 2 +- src/datatypes.c | 70 ++++++++++++++++++++--------- src/datatypes.h | 15 ++++--- src/libvirt-storage.c | 6 +-- src/libvirt_private.syms | 2 +- src/qemu/qemu_migration.c | 3 +- src/remote/remote_daemon_dispatch.c | 3 +- src/remote/remote_driver.c | 6 +-- src/rpc/gendispatch.pl | 1 + src/vz/vz_sdk.c | 3 +- 11 files changed, 73 insertions(+), 53 deletions(-) diff --git a/src/conf/storage_event.c b/src/conf/storage_event.c index de36ec3af9..e18069f718 100644 --- a/src/conf/storage_event.c +++ b/src/conf/storage_event.c @@ -110,10 +110,10 @@ virStoragePoolEventDispatchDefaultFunc(virConnectPtr = conn, virConnectObjectEventGenericCallbac= k cb, void *cbopaque) { - virStoragePoolPtr pool =3D virGetStoragePool(conn, - event->meta.name, - event->meta.uuid, - NULL, NULL); + g_autoptr(virStoragePool) pool =3D virGetStoragePool(conn, + event->meta.name, + event->meta.uuid, + NULL, NULL); if (!pool) return; =20 @@ -127,23 +127,20 @@ virStoragePoolEventDispatchDefaultFunc(virConnectPtr = conn, storagePoolL= ifecycleEvent->type, storagePoolL= ifecycleEvent->detail, cbopaque); - goto cleanup; + return; } =20 case VIR_STORAGE_POOL_EVENT_ID_REFRESH: { ((virConnectStoragePoolEventGenericCallback)cb)(conn, pool, cbopaque); - goto cleanup; + return; } =20 case VIR_STORAGE_POOL_EVENT_ID_LAST: break; } VIR_WARN("Unexpected event ID %d", event->eventID); - - cleanup: - virObjectUnref(pool); } =20 =20 diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 5cbd30f93c..4c25c9a9f8 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -2095,6 +2095,6 @@ virStoragePoolObjListExport(virConnectPtr conn, return data.nPools; =20 error: - virObjectListFree(data.pools); + virGObjectListFreeCount(data.pools, data.nPools); return -1; } diff --git a/src/datatypes.c b/src/datatypes.c index 455bcd70ef..a9a942b3a6 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -40,7 +40,6 @@ virClassPtr virNodeDeviceClass; virClassPtr virSecretClass; virClassPtr virStreamClass; virClassPtr virStorageVolClass; -virClassPtr virStoragePoolClass; =20 static void virConnectDispose(void *obj); static void virConnectCloseCallbackDataDispose(void *obj); @@ -49,7 +48,6 @@ static void virNodeDeviceDispose(void *obj); static void virSecretDispose(void *obj); static void virStreamDispose(void *obj); static void virStorageVolDispose(void *obj); -static void virStoragePoolDispose(void *obj); =20 G_DEFINE_TYPE(virDomainCheckpoint, vir_domain_checkpoint, G_TYPE_OBJECT); static void virDomainCheckpointDispose(GObject *obj); @@ -177,6 +175,24 @@ vir_nw_filter_binding_class_init(virNWFilterBindingCla= ss *klass) obj->finalize =3D virNWFilterBindingFinalize; } =20 +G_DEFINE_TYPE(virStoragePool, vir_storage_pool, G_TYPE_OBJECT); +static void virStoragePoolDispose(GObject *obj); +static void virStoragePoolFinalize(GObject *obj); + +static void +vir_storage_pool_init(virStoragePool *pool G_GNUC_UNUSED) +{ +} + +static void +vir_storage_pool_class_init(virStoragePoolClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->dispose =3D virStoragePoolDispose; + obj->finalize =3D virStoragePoolFinalize; +} + virClassPtr virAdmConnectClass; virClassPtr virAdmConnectCloseCallbackDataClass; =20 @@ -235,7 +251,6 @@ virDataTypesOnceInit(void) DECLARE_CLASS(virSecret); DECLARE_CLASS(virStream); DECLARE_CLASS(virStorageVol); - DECLARE_CLASS(virStoragePool); =20 DECLARE_CLASS_LOCKABLE(virAdmConnect); DECLARE_CLASS_LOCKABLE(virAdmConnectCloseCallbackData); @@ -681,7 +696,7 @@ virInterfaceFinalize(GObject *obj) * @freeFunc: private data cleanup function pointer specific to driver * * Allocates a new storage pool object. When the object is no longer neede= d, - * 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 pool object, or NULL on error. */ @@ -690,17 +705,16 @@ virGetStoragePool(virConnectPtr conn, const char *nam= e, const unsigned char *uuid, void *privateData, virFreeCallback freeFunc) { - virStoragePoolPtr ret =3D NULL; + g_autoptr(virStoragePool) ret =3D NULL; =20 if (virDataTypesInitialize() < 0) return NULL; =20 - virCheckConnectGoto(conn, error); - virCheckNonNullArgGoto(name, error); - virCheckNonNullArgGoto(uuid, error); + virCheckConnectReturn(conn, NULL); + virCheckNonNullArgReturn(name, NULL); + virCheckNonNullArgReturn(uuid, NULL); =20 - if (!(ret =3D virObjectNew(virStoragePoolClass))) - goto error; + ret =3D VIR_STORAGE_POOL(g_object_new(VIR_TYPE_STORAGE_POOL, NULL)); =20 ret->name =3D g_strdup(name); =20 @@ -711,11 +725,7 @@ virGetStoragePool(virConnectPtr conn, 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 @@ -723,16 +733,31 @@ virGetStoragePool(virConnectPtr conn, const char *nam= e, * virStoragePoolDispose: * @obj: the storage pool to release * - * Unconditionally release all memory associated with a pool. - * The pool 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 +virStoragePoolDispose(GObject *obj) +{ + virStoragePoolPtr pool =3D VIR_STORAGE_POOL(obj); + + virObjectUnref(pool->conn); + pool->conn =3D NULL; + + G_OBJECT_CLASS(vir_storage_pool_parent_class)->dispose(obj); +} + +/** + * virStoragePoolFinalize: + * @obj: the storage pool 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 pool. + * The pool object must not be used once this method returns. */ static void -virStoragePoolDispose(void *obj) +virStoragePoolFinalize(GObject *obj) { - virStoragePoolPtr pool =3D obj; + virStoragePoolPtr pool =3D VIR_STORAGE_POOL(obj); char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 virUUIDFormat(pool->uuid, uuidstr); @@ -742,7 +767,8 @@ virStoragePoolDispose(void *obj) pool->privateDataFreeFunc(pool->privateData); =20 VIR_FREE(pool->name); - virObjectUnref(pool->conn); + + G_OBJECT_CLASS(vir_storage_pool_parent_class)->finalize(obj); } =20 =20 diff --git a/src/datatypes.h b/src/datatypes.h index e9bc1574e7..2c8256388c 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -36,7 +36,6 @@ extern virClassPtr virNodeDeviceClass; extern virClassPtr virSecretClass; extern virClassPtr virStreamClass; extern virClassPtr virStorageVolClass; -extern virClassPtr virStoragePoolClass; =20 #define VIR_TYPE_DOMAIN_CHECKPOINT vir_domain_checkpoint_get_type() G_DECLARE_FINAL_TYPE(virDomainCheckpoint, @@ -71,6 +70,9 @@ G_DECLARE_FINAL_TYPE(virNWFilterBinding, NW_FILTER_BINDING, GObject); =20 +#define VIR_TYPE_STORAGE_POOL vir_storage_pool_get_type() +G_DECLARE_FINAL_TYPE(virStoragePool, vir_storage_pool, VIR, STORAGE_POOL, = GObject); + extern virClassPtr virAdmConnectClass; =20 #define VIR_TYPE_ADM_SERVER vir_adm_server_get_type() @@ -191,8 +193,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); =20 #define virCheckStoragePoolReturn(obj, retval) \ do { \ - virStoragePoolPtr _pool =3D (obj); \ - if (!virObjectIsClass(_pool, virStoragePoolClass) || \ + virStoragePoolPtr _pool =3D VIR_STORAGE_POOL(obj); \ + if (_pool =3D=3D NULL || \ !virObjectIsClass(_pool->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_STORAGE, \ VIR_ERR_INVALID_STORAGE_POOL, \ @@ -205,8 +207,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); =20 #define virCheckStoragePoolGoto(obj, label) \ do { \ - virStoragePoolPtr _pool=3D (obj); \ - if (!virObjectIsClass(_pool, virStoragePoolClass) || \ + virStoragePoolPtr _pool=3D VIR_STORAGE_POOL(obj); \ + if (_pool =3D=3D NULL || \ !virObjectIsClass(_pool->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_STORAGE, \ VIR_ERR_INVALID_STORAGE_POOL, \ @@ -683,7 +685,7 @@ struct _virInterface { * Internal structure associated to a storage pool */ struct _virStoragePool { - virObject parent; + GObject parent; virConnectPtr conn; /* pointer back to the connection= */ char *name; /* the storage pool external name= */ unsigned char uuid[VIR_UUID_BUFLEN]; /* the storage pool unique identi= fier */ @@ -696,7 +698,6 @@ struct _virStoragePool { virFreeCallback privateDataFreeFunc; }; =20 -G_DEFINE_AUTOPTR_CLEANUP_FUNC(virStoragePool, virObjectUnref); =20 =20 /** diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c index 0406fe84d3..b88b2162de 100644 --- a/src/libvirt-storage.c +++ b/src/libvirt-storage.c @@ -846,7 +846,7 @@ virStoragePoolFree(virStoragePoolPtr pool) =20 virCheckStoragePoolReturn(pool, -1); =20 - virObjectUnref(pool); + g_object_unref(pool); return 0; =20 } @@ -872,13 +872,13 @@ virStoragePoolFree(virStoragePoolPtr pool) int virStoragePoolRef(virStoragePoolPtr pool) { - VIR_DEBUG("pool=3D%p refs=3D%d", pool, pool ? pool->parent.u.s.refs : = 0); + VIR_DEBUG("pool=3D%p", pool); =20 virResetLastError(); =20 virCheckStoragePoolReturn(pool, -1); =20 - virObjectRef(pool); + g_object_ref(pool); return 0; } =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1549a85133..94009505bc 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1353,6 +1353,7 @@ vir_network_get_type; vir_network_port_get_type; vir_nw_filter_binding_get_type; vir_nw_filter_get_type; +vir_storage_pool_get_type; virConnectClass; virConnectCloseCallbackDataCall; virConnectCloseCallbackDataClass; @@ -1377,7 +1378,6 @@ virGetStream; virNewConnectCloseCallbackData; virNodeDeviceClass; virSecretClass; -virStoragePoolClass; virStorageVolClass; virStreamClass; =20 diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index bc280e856a..de65c730f7 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -174,7 +174,7 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, unsigned long long capacity) { int ret =3D -1; - virStoragePoolPtr pool =3D NULL; + g_autoptr(virStoragePool) pool =3D NULL; virStorageVolPtr vol =3D NULL; char *volName =3D NULL, *basePath =3D NULL; char *volStr =3D NULL; @@ -269,7 +269,6 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, VIR_FREE(basePath); VIR_FREE(volStr); virObjectUnref(vol); - virObjectUnref(pool); return ret; } =20 diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 2e4e1a65db..e7b2a5f363 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -6136,7 +6136,7 @@ remoteDispatchConnectStoragePoolEventRegisterAny(virN= etServerPtr server G_GNUC_U daemonClientEventCallbackPtr ref; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); - virStoragePoolPtr pool =3D NULL; + g_autoptr(virStoragePool) pool =3D NULL; virConnectPtr conn =3D remoteGetStorageConn(client); =20 virMutexLock(&priv->lock); @@ -6194,7 +6194,6 @@ remoteDispatchConnectStoragePoolEventRegisterAny(virN= etServerPtr server G_GNUC_U remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); - virObjectUnref(pool); return rv; } =20 diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 9373ba78b7..745033befb 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5477,7 +5477,7 @@ remoteStoragePoolBuildEventLifecycle(virNetClientProg= ramPtr prog G_GNUC_UNUSED, virConnectPtr conn =3D opaque; struct private_data *priv =3D conn->privateData; remote_storage_pool_event_lifecycle_msg *msg =3D evdata; - virStoragePoolPtr pool; + g_autoptr(virStoragePool) pool =3D NULL; virObjectEventPtr event =3D NULL; =20 pool =3D get_nonnull_storage_pool(conn, msg->pool); @@ -5486,7 +5486,6 @@ remoteStoragePoolBuildEventLifecycle(virNetClientProg= ramPtr prog G_GNUC_UNUSED, =20 event =3D virStoragePoolEventLifecycleNew(pool->name, pool->uuid, msg-= >event, msg->detail); - virObjectUnref(pool); =20 virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } @@ -5499,7 +5498,7 @@ remoteStoragePoolBuildEventRefresh(virNetClientProgra= mPtr prog G_GNUC_UNUSED, virConnectPtr conn =3D opaque; struct private_data *priv =3D conn->privateData; remote_storage_pool_event_refresh_msg *msg =3D evdata; - virStoragePoolPtr pool; + g_autoptr(virStoragePool) pool =3D NULL; virObjectEventPtr event =3D NULL; =20 pool =3D get_nonnull_storage_pool(conn, msg->pool); @@ -5507,7 +5506,6 @@ remoteStoragePoolBuildEventRefresh(virNetClientProgra= mPtr prog G_GNUC_UNUSED, return; =20 event =3D virStoragePoolEventRefreshNew(pool->name, pool->uuid); - virObjectUnref(pool); =20 virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 0f16ca89c2..8d19651367 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -203,6 +203,7 @@ my %gobject_impl =3D ( virNetworkPort =3D> 1, virNWFilter =3D> 1, virNWFilterBinding =3D> 1, + virStoragePool =3D> 1, ); =20 sub use_gobject { diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 9cee6f1fde..ed3d5ee2c0 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -4081,7 +4081,7 @@ prlsdkCreateVm(vzDriverPtr driver, virDomainDefPtr de= f) static int virStorageTranslatePoolLocal(virConnectPtr conn, virStorageSourcePtr src) { - virStoragePoolPtr pool =3D NULL; + g_autoptr(virStoragePool) pool =3D NULL; virStorageVolPtr vol =3D NULL; virStorageVolInfo info; int ret =3D -1; @@ -4115,7 +4115,6 @@ virStorageTranslatePoolLocal(virConnectPtr conn, virS= torageSourcePtr src) ret =3D 0; =20 cleanup: - virObjectUnref(pool); virObjectUnref(vol); return ret; } --=20 2.25.3