From nobody Fri Dec 19 21:49:37 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1587477044; cv=none; d=zohomail.com; s=zohoarc; b=iB7//XsAa2PmVYrIrswMrHVLYyNDb/U7bYvrMBGM4A7jX8Dhl87jiwXNOPOg79UQwxu5lheCOyemQyov0uEVILOruLUzPNsm4XNLaC3PTYZ2PeSXVpbtWfim1y6ykSFK7etPJmCsSGs8PiHACr87exjGtf//qF4AAYN3RZO/n4A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587477044; 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=7gICtV1f1tQz0lq0itzsgy/eECpoa+CNjWrF5UxQ9MM=; b=D0oCPCVUnCYoEHz9CP21eDn9tcMjrujztcg6VhJuvjFGLTpjHbV831jCwYjyZGwBCex08uX2YgVHG/YfPm4/lyJ2ADtbLhbYRTB/OZynxeGKdMF4JGgJwjnuz2cv7Ufy3B1OHcDEv0oRTg7pFn5kQP3/jwkT8kMBa74l5VBIqm0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1587477044381399.54564250953626; Tue, 21 Apr 2020 06:50:44 -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-417-nXzvHadOMuSQpS8af909Vg-1; Tue, 21 Apr 2020 09:50:40 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5354E149C6; Tue, 21 Apr 2020 13:50:35 +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 2262AB3A60; Tue, 21 Apr 2020 13:50:35 +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 C8729180880B; Tue, 21 Apr 2020 13:50:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03LDoR38003409 for ; Tue, 21 Apr 2020 09:50:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id DEBEF1C0EF4; Tue, 21 Apr 2020 13:50:26 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D8BFA1C0EEB for ; Tue, 21 Apr 2020 13:50:26 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (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 B06E480029A for ; Tue, 21 Apr 2020 13:50:26 +0000 (UTC) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-401-FaIx7C24Mu6FBLI-vsyONQ-1; Tue, 21 Apr 2020 09:50:23 -0400 Received: by mail-wr1-f48.google.com with SMTP id d17so16515503wrg.11 for ; Tue, 21 Apr 2020 06:50:23 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 06:50:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587477043; 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=7gICtV1f1tQz0lq0itzsgy/eECpoa+CNjWrF5UxQ9MM=; b=JLEDVydBqmtwGolodxmm/vISO2ucwRF1dsEeJQwfUEAdEIq/npCqeL7AL9iVLPRYQXCVtt tNNUwSKU4jXOJqspdlJ4Xm0aIabsrmBOjGPBJnVnQEpxhyyzwbNpVQVSMSBVMieYrHYysH 7ntfh/CyEl2/8Kf7FIcJ4MwnnA7oGyk= X-MC-Unique: nXzvHadOMuSQpS8af909Vg-1 X-MC-Unique: FaIx7C24Mu6FBLI-vsyONQ-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=HcpuAa3lWHYYERPDjriV9NNERG6hHBRoOm8gjHoHtlw=; b=lJkfsJhb1kypzq++AqxpD9JGvGpAsjGnOiv/+rkmVUWp0O+CyPXsrJqKYMN3W/5iF0 Req+/YN+9CJ2TmhgCBV3wai9Elg4g+lcre8vOnCEDVsZQJwmVsJInkgSHFVdPNBV/8QB 28oDEHEmV+zZg7bSYas2HNP54yPaYLZyJpWC0URybDHY/vFpAjMYEBIHEOBkIg4wiXsn 9TZNAI6u7xcfkbdwfeGLecAWRiworJvD2BofhjGKTRi2/Bcb6AtKQdCFxC/XXaE7OIx2 kuBVDWw+DgvUB95pdvACD4IOS82N/o+wuUoQyIOIq0t3Mv6BHfp/eYU6Q2P1WxIKODKZ usxw== X-Gm-Message-State: AGi0Pubb5S3jicOPXeSCIEYFfoCPkw98Ec+/+zxnNq3FSN4qWlIq7Prm 5jDWniVCNoKVU6NzTF6KjE9SyxGkOvQ= X-Google-Smtp-Source: APiQypJyA0uQU/TSApPsMO7NKyTsfMVBiavHADz+XEv721d6JLDIho8hnWv9XkFj6UvV5CCyoS8j6g== X-Received: by 2002:adf:8b1d:: with SMTP id n29mr23740562wra.196.1587477021837; Tue, 21 Apr 2020 06:50:21 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH v2 17/40] datatypes: convert virDomainCheckpoint to GObject Date: Tue, 21 Apr 2020 15:48:58 +0200 Message-Id: <20200421134921.3717019-18-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.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 03LDoR38003409 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.15 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/virdomaincheckpointobjlist.c | 7 +-- src/datatypes.c | 68 ++++++++++++++++++--------- src/datatypes.h | 14 ++++-- src/libvirt-domain-checkpoint.c | 7 ++- src/libvirt_private.syms | 2 +- src/rpc/gendispatch.pl | 1 + 6 files changed, 64 insertions(+), 35 deletions(-) diff --git a/src/conf/virdomaincheckpointobjlist.c b/src/conf/virdomainchec= kpointobjlist.c index a4942ea706..2c4d484226 100644 --- a/src/conf/virdomaincheckpointobjlist.c +++ b/src/conf/virdomaincheckpointobjlist.c @@ -234,10 +234,7 @@ virDomainListCheckpoints(virDomainCheckpointObjListPtr= checkpoints, for (i =3D 0; i < count; i++) VIR_FREE(names[i]); VIR_FREE(names); - if (ret < 0 && list) { - for (i =3D 0; i < count; i++) - virObjectUnref(list[i]); - VIR_FREE(list); - } + if (ret < 0) + virGObjectListFreeCount(list, count); return ret; } diff --git a/src/datatypes.c b/src/datatypes.c index 83028708da..8a044a2ab3 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -36,7 +36,6 @@ VIR_LOG_INIT("datatypes"); virClassPtr virConnectClass; virClassPtr virConnectCloseCallbackDataClass; virClassPtr virDomainClass; -virClassPtr virDomainCheckpointClass; virClassPtr virDomainSnapshotClass; virClassPtr virInterfaceClass; virClassPtr virNetworkClass; @@ -52,7 +51,6 @@ virClassPtr virStoragePoolClass; static void virConnectDispose(void *obj); static void virConnectCloseCallbackDataDispose(void *obj); static void virDomainDispose(void *obj); -static void virDomainCheckpointDispose(void *obj); static void virDomainSnapshotDispose(void *obj); static void virInterfaceDispose(void *obj); static void virNetworkDispose(void *obj); @@ -65,6 +63,24 @@ 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); +static void virDomainCheckpointFinalize(GObject *obj); + +static void +vir_domain_checkpoint_init(virDomainCheckpoint *dc G_GNUC_UNUSED) +{ +} + +static void +vir_domain_checkpoint_class_init(virDomainCheckpointClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->dispose =3D virDomainCheckpointDispose; + obj->finalize =3D virDomainCheckpointFinalize; +} + virClassPtr virAdmConnectClass; virClassPtr virAdmConnectCloseCallbackDataClass; =20 @@ -119,7 +135,6 @@ virDataTypesOnceInit(void) DECLARE_CLASS_LOCKABLE(virConnect); DECLARE_CLASS_LOCKABLE(virConnectCloseCallbackData); DECLARE_CLASS(virDomain); - DECLARE_CLASS(virDomainCheckpoint); DECLARE_CLASS(virDomainSnapshot); DECLARE_CLASS(virInterface); DECLARE_CLASS(virNetwork); @@ -986,7 +1001,7 @@ virNWFilterBindingDispose(void *obj) * @name: pointer to the domain checkpoint name * * Allocates a new domain checkpoint 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 domain checkpoint object, or NULL on error. */ @@ -994,25 +1009,20 @@ virDomainCheckpointPtr virGetDomainCheckpoint(virDomainPtr domain, const char *name) { - virDomainCheckpointPtr ret =3D NULL; + g_autoptr(virDomainCheckpoint) ret =3D NULL; =20 if (virDataTypesInitialize() < 0) return NULL; =20 - virCheckDomainGoto(domain, error); - virCheckNonNullArgGoto(name, error); + virCheckDomainReturn(domain, NULL); + virCheckNonNullArgReturn(name, NULL); =20 - if (!(ret =3D virObjectNew(virDomainCheckpointClass))) - goto error; + ret =3D VIR_DOMAIN_CHECKPOINT(g_object_new(VIR_TYPE_DOMAIN_CHECKPOINT,= NULL)); ret->name =3D g_strdup(name); =20 ret->domain =3D virObjectRef(domain); =20 - return ret; - - error: - virObjectUnref(ret); - return NULL; + return g_steal_pointer(&ret); } =20 =20 @@ -1020,20 +1030,36 @@ virGetDomainCheckpoint(virDomainPtr domain, * virDomainCheckpointDispose: * @obj: the domain checkpoint to release * - * Unconditionally release all memory associated with a checkpoint. - * The checkpoint 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 +virDomainCheckpointDispose(GObject *obj) +{ + virDomainCheckpointPtr checkpoint =3D VIR_DOMAIN_CHECKPOINT(obj); + + virObjectUnref(checkpoint->domain); + checkpoint->domain =3D NULL; + + G_OBJECT_CLASS(vir_domain_checkpoint_parent_class)->dispose(obj); +} + +/** + * virDomainCheckpointFinalize: + * @obj: the domain checkpoint 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 checkpoint. + * The checkpoint object must not be used once this method returns. */ static void -virDomainCheckpointDispose(void *obj) +virDomainCheckpointFinalize(GObject *obj) { - virDomainCheckpointPtr checkpoint =3D obj; + virDomainCheckpointPtr checkpoint =3D VIR_DOMAIN_CHECKPOINT(obj); VIR_DEBUG("release checkpoint %p %s", checkpoint, checkpoint->name); =20 VIR_FREE(checkpoint->name); - virObjectUnref(checkpoint->domain); + + G_OBJECT_CLASS(vir_domain_checkpoint_parent_class)->finalize(obj); } =20 =20 diff --git a/src/datatypes.h b/src/datatypes.h index 482ad0274c..e6817dc43d 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -32,7 +32,6 @@ =20 extern virClassPtr virConnectClass; extern virClassPtr virDomainClass; -extern virClassPtr virDomainCheckpointClass; extern virClassPtr virDomainSnapshotClass; extern virClassPtr virInterfaceClass; extern virClassPtr virNetworkClass; @@ -45,6 +44,13 @@ 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, + vir_domain_checkpoint, + VIR, + DOMAIN_CHECKPOINT, + GObject); + extern virClassPtr virAdmConnectClass; =20 #define VIR_TYPE_ADM_SERVER vir_adm_server_get_type() @@ -327,8 +333,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); =20 #define virCheckDomainCheckpointReturn(obj, retval) \ do { \ - virDomainCheckpointPtr _check =3D (obj); \ - if (!virObjectIsClass(_check, virDomainCheckpointClass) || \ + virDomainCheckpointPtr _check =3D VIR_DOMAIN_CHECKPOINT(obj); \ + if (_check =3D=3D NULL || \ !virObjectIsClass(_check->domain, virDomainClass) || \ !virObjectIsClass(_check->domain->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_DOMAIN_CHECKPOINT, \ @@ -749,7 +755,7 @@ struct _virStream { * Internal structure associated with a domain checkpoint */ struct _virDomainCheckpoint { - virObject parent; + GObject parent; char *name; virDomainPtr domain; }; diff --git a/src/libvirt-domain-checkpoint.c b/src/libvirt-domain-checkpoin= t.c index 432c2d5a52..77ef434d30 100644 --- a/src/libvirt-domain-checkpoint.c +++ b/src/libvirt-domain-checkpoint.c @@ -535,14 +535,13 @@ virDomainCheckpointDelete(virDomainCheckpointPtr chec= kpoint, int virDomainCheckpointRef(virDomainCheckpointPtr checkpoint) { - VIR_DEBUG("checkpoint=3D%p, refs=3D%d", checkpoint, - checkpoint ? checkpoint->parent.u.s.refs : 0); + VIR_DEBUG("checkpoint=3D%p", checkpoint); =20 virResetLastError(); =20 virCheckDomainCheckpointReturn(checkpoint, -1); =20 - virObjectRef(checkpoint); + g_object_ref(checkpoint); return 0; } =20 @@ -565,6 +564,6 @@ virDomainCheckpointFree(virDomainCheckpointPtr checkpoi= nt) =20 virCheckDomainCheckpointReturn(checkpoint, -1); =20 - virObjectUnref(checkpoint); + g_object_unref(checkpoint); return 0; } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1a46ec3e3e..bfce1b0b8f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1346,13 +1346,13 @@ virCPUx86FeatureFilterDropMSR; virCPUx86FeatureFilterSelectMSR; =20 # datatypes.h +vir_domain_checkpoint_get_type; virConnectClass; virConnectCloseCallbackDataCall; virConnectCloseCallbackDataClass; virConnectCloseCallbackDataGetCallback; virConnectCloseCallbackDataRegister; virConnectCloseCallbackDataUnregister; -virDomainCheckpointClass; virDomainClass; virDomainSnapshotClass; virGetConnect; diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index fa5340d5e8..c8fba3dc2b 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -196,6 +196,7 @@ sub get_conn_method { my %gobject_impl =3D ( virAdmClient =3D> 1, virAdmServer =3D> 1, + virDomainCheckpoint =3D> 1, ); =20 sub use_gobject { --=20 2.25.3