From nobody Fri Dec 19 21:49:41 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=1587477050; cv=none; d=zohomail.com; s=zohoarc; b=E63EqsxXIMjRDfz/ndzcHS074dumngNgkSUI5sGoffN6eK5VgVqGQnd7+E0JF3PECTK4cTfNlPMgSQ+oCQ8YVZe5C+hbq1pbSiahaTdEWZe/D7Ub+j8xJTXW4r+8dLUxsBEmDoXq/m2IAXM6IGBTmTKMbFxn2CKYF8u0dkn16tE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587477050; 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=ECcG0wwllU3HiczIrqHduN8vyJpBpvPOTywzee01oBc=; b=V5PToXGCcFp6ysLljG3ZhUlRBjkFqsW1rlx4wnUWslSU3pZW0Nqc7u/UmjyV22/SQeQRYmsVjxnTmCJmPAwkot3n4JRLb5P1TyS1pcQr7QXJSfvAtnKpOL0NFaumKv5kkscnLtnSqBGcKVobghpqcrISG67ku6Bj9IM36oetOPM= 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 1587477050359715.1887741654951; Tue, 21 Apr 2020 06:50:50 -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-315-eNTl3YEeP2Olzd_bPLkluQ-1; Tue, 21 Apr 2020 09:50:45 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3E40E149D4; Tue, 21 Apr 2020 13:50:40 +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 055142898A; Tue, 21 Apr 2020 13:50:40 +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 AF66E1803C33; Tue, 21 Apr 2020 13:50:39 +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 03LDoTPS003426 for ; Tue, 21 Apr 2020 09:50:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id AFD3720292BF; Tue, 21 Apr 2020 13:50:29 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ABC3D2093CE5 for ; Tue, 21 Apr 2020 13:50:27 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.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 4275E86BCA9 for ; Tue, 21 Apr 2020 13:50:27 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-384-16lGn3myPGiDlwSjqPHIaw-1; Tue, 21 Apr 2020 09:50:25 -0400 Received: by mail-wm1-f47.google.com with SMTP id e26so3632029wmk.5 for ; Tue, 21 Apr 2020 06:50:24 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 06:50:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587477049; 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=ECcG0wwllU3HiczIrqHduN8vyJpBpvPOTywzee01oBc=; b=Z7a4qbOXN84eLKymevLwkST/FMT3fCxkHn1cklXUWO/DV56hZaDfVFOru8l8EPcnLyxu8w 60IuqsOyNJqqC8mhE7vUiw3LaPpkKmGvdDGN13BgrAT3bsQW01jQgTfqXMfKRTKhKcveNr atuZHLGDBdmUm76hWYpQLbQVK4EqzcY= X-MC-Unique: eNTl3YEeP2Olzd_bPLkluQ-1 X-MC-Unique: 16lGn3myPGiDlwSjqPHIaw-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=We+bOAw3b961PgQ1W/vpM3KWaGd32b5F/OTtDeF1shQ=; b=DiarN918NdaTfMeTHtio5f/+AEczwj78fKuOYXPJQIJ/w6PH2Kx+ebtbb9j2AxsQPb YeEHSONCeYNpOEJr2koFjwOtWVfXZ1DpHjeZ5tkw6JDbWLeVkTxdhEDtCUFuGtyuGHpp HsnYpdmJdbQdb85J0USUUyOtlZd+hyZlC0Do9dfbxv10+md4nsz8ZpoPZsplzt3oY/E0 5lqeAyY5A1rZS9AaAfPSooXeKXSlj0Js73JBwknrk0vsQqYusgcKRiAxM6YhMgCivOWK XOvTn2Gz1sAxW30VWZ0/0hLyf3M3bDK2Z1iTJZqQgoWkZovazW2hOM6ISKKsC3dE1Cao 8mGQ== X-Gm-Message-State: AGi0PuaZ24swWr64wHVQ+4Apmi8zuDmPbHomOsB9+nJUY1F6cUC4+k8k aMXJRYm/cDnwkAy0ZNz6gGZX5DNGUE4= X-Google-Smtp-Source: APiQypKjSwEtv4H6CXPHEkk/LJ+eAAC8XDoMZi99uJifPPDYvwhMrnsVDekmJaG85/A992jR7ckO8A== X-Received: by 2002:a1c:2e0a:: with SMTP id u10mr4980265wmu.146.1587477023308; Tue, 21 Apr 2020 06:50:23 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH v2 18/40] datatypes: convert virDomainSnapshot to GObject Date: Tue, 21 Apr 2020 15:48:59 +0200 Message-Id: <20200421134921.3717019-19-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.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 03LDoTPS003426 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.84 on 10.5.11.23 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/virdomainsnapshotobjlist.c | 7 +-- src/datatypes.c | 68 ++++++++++++++++++++--------- src/datatypes.h | 12 +++-- src/libvirt-domain-snapshot.c | 7 ++- src/libvirt_private.syms | 2 +- src/qemu/qemu_driver.c | 3 +- src/rpc/gendispatch.pl | 1 + 7 files changed, 64 insertions(+), 36 deletions(-) diff --git a/src/conf/virdomainsnapshotobjlist.c b/src/conf/virdomainsnapsh= otobjlist.c index 910b0714c7..54d1892dc4 100644 --- a/src/conf/virdomainsnapshotobjlist.c +++ b/src/conf/virdomainsnapshotobjlist.c @@ -285,10 +285,7 @@ virDomainListSnapshots(virDomainSnapshotObjListPtr sna= pshots, 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 8a044a2ab3..334d9d8638 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -36,7 +36,6 @@ VIR_LOG_INIT("datatypes"); virClassPtr virConnectClass; virClassPtr virConnectCloseCallbackDataClass; virClassPtr virDomainClass; -virClassPtr virDomainSnapshotClass; virClassPtr virInterfaceClass; virClassPtr virNetworkClass; virClassPtr virNetworkPortClass; @@ -51,7 +50,6 @@ virClassPtr virStoragePoolClass; static void virConnectDispose(void *obj); static void virConnectCloseCallbackDataDispose(void *obj); static void virDomainDispose(void *obj); -static void virDomainSnapshotDispose(void *obj); static void virInterfaceDispose(void *obj); static void virNetworkDispose(void *obj); static void virNetworkPortDispose(void *obj); @@ -81,6 +79,24 @@ vir_domain_checkpoint_class_init(virDomainCheckpointClas= s *klass) obj->finalize =3D virDomainCheckpointFinalize; } =20 +G_DEFINE_TYPE(virDomainSnapshot, vir_domain_snapshot, G_TYPE_OBJECT); +static void virDomainSnapshotDispose(GObject *obj); +static void virDomainSnapshotFinalize(GObject *obj); + +static void +vir_domain_snapshot_init(virDomainSnapshot *ds G_GNUC_UNUSED) +{ +} + +static void +vir_domain_snapshot_class_init(virDomainSnapshotClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->dispose =3D virDomainSnapshotDispose; + obj->finalize =3D virDomainSnapshotFinalize; +} + virClassPtr virAdmConnectClass; virClassPtr virAdmConnectCloseCallbackDataClass; =20 @@ -135,7 +151,6 @@ virDataTypesOnceInit(void) DECLARE_CLASS_LOCKABLE(virConnect); DECLARE_CLASS_LOCKABLE(virConnectCloseCallbackData); DECLARE_CLASS(virDomain); - DECLARE_CLASS(virDomainSnapshot); DECLARE_CLASS(virInterface); DECLARE_CLASS(virNetwork); DECLARE_CLASS(virNetworkPort); @@ -1069,32 +1084,27 @@ virDomainCheckpointFinalize(GObject *obj) * @name: pointer to the domain snapshot name * * Allocates a new domain snapshot object. When the object is no longer ne= eded, - * 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 snapshot object, or NULL on error. */ virDomainSnapshotPtr virGetDomainSnapshot(virDomainPtr domain, const char *name) { - virDomainSnapshotPtr ret =3D NULL; + g_autoptr(virDomainSnapshot) 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(virDomainSnapshotClass))) - goto error; + ret =3D VIR_DOMAIN_SNAPSHOT(g_object_new(VIR_TYPE_DOMAIN_SNAPSHOT, NUL= L)); 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 @@ -1102,20 +1112,36 @@ virGetDomainSnapshot(virDomainPtr domain, const cha= r *name) * virDomainSnapshotDispose: * @obj: the domain snapshot to release * - * Unconditionally release all memory associated with a snapshot. - * The snapshot 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 +virDomainSnapshotDispose(GObject *obj) +{ + virDomainSnapshotPtr snapshot =3D VIR_DOMAIN_SNAPSHOT(obj); + + virObjectUnref(snapshot->domain); + snapshot->domain =3D NULL; + + G_OBJECT_CLASS(vir_domain_snapshot_parent_class)->dispose(obj); +} + +/** + * virDomainSnapshotFinalize: + * @obj: the domain snapshot 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 snapshot. + * The snapshot object must not be used once this method returns. */ static void -virDomainSnapshotDispose(void *obj) +virDomainSnapshotFinalize(GObject *obj) { - virDomainSnapshotPtr snapshot =3D obj; + virDomainSnapshotPtr snapshot =3D VIR_DOMAIN_SNAPSHOT(obj); VIR_DEBUG("release snapshot %p %s", snapshot, snapshot->name); =20 VIR_FREE(snapshot->name); - virObjectUnref(snapshot->domain); + + G_OBJECT_CLASS(vir_domain_snapshot_parent_class)->finalize(obj); } =20 =20 diff --git a/src/datatypes.h b/src/datatypes.h index e6817dc43d..9dfb18147e 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -32,7 +32,6 @@ =20 extern virClassPtr virConnectClass; extern virClassPtr virDomainClass; -extern virClassPtr virDomainSnapshotClass; extern virClassPtr virInterfaceClass; extern virClassPtr virNetworkClass; extern virClassPtr virNetworkPortClass; @@ -51,6 +50,13 @@ G_DECLARE_FINAL_TYPE(virDomainCheckpoint, DOMAIN_CHECKPOINT, GObject); =20 +#define VIR_TYPE_DOMAIN_SNAPSHOT vir_domain_snapshot_get_type() +G_DECLARE_FINAL_TYPE(virDomainSnapshot, + vir_domain_snapshot, + VIR, + DOMAIN_SNAPSHOT, + GObject); + extern virClassPtr virAdmConnectClass; =20 #define VIR_TYPE_ADM_SERVER vir_adm_server_get_type() @@ -349,7 +355,7 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); #define virCheckDomainSnapshotReturn(obj, retval) \ do { \ virDomainSnapshotPtr _snap =3D (obj); \ - if (!virObjectIsClass(_snap, virDomainSnapshotClass) || \ + if (_snap =3D=3D NULL || \ !virObjectIsClass(_snap->domain, virDomainClass) || \ !virObjectIsClass(_snap->domain->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_DOMAIN_SNAPSHOT, \ @@ -767,7 +773,7 @@ struct _virDomainCheckpoint { * Internal structure associated with a domain snapshot */ struct _virDomainSnapshot { - virObject parent; + GObject parent; char *name; virDomainPtr domain; }; diff --git a/src/libvirt-domain-snapshot.c b/src/libvirt-domain-snapshot.c index 33593e11e9..ce870de712 100644 --- a/src/libvirt-domain-snapshot.c +++ b/src/libvirt-domain-snapshot.c @@ -1080,14 +1080,13 @@ virDomainSnapshotDelete(virDomainSnapshotPtr snapsh= ot, int virDomainSnapshotRef(virDomainSnapshotPtr snapshot) { - VIR_DEBUG("snapshot=3D%p, refs=3D%d", snapshot, - snapshot ? snapshot->parent.u.s.refs : 0); + VIR_DEBUG("snapshot=3D%p", snapshot); =20 virResetLastError(); =20 virCheckDomainSnapshotReturn(snapshot, -1); =20 - virObjectRef(snapshot); + g_object_ref(snapshot); return 0; } =20 @@ -1110,6 +1109,6 @@ virDomainSnapshotFree(virDomainSnapshotPtr snapshot) =20 virCheckDomainSnapshotReturn(snapshot, -1); =20 - virObjectUnref(snapshot); + g_object_unref(snapshot); return 0; } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index bfce1b0b8f..33d6d4950d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1347,6 +1347,7 @@ virCPUx86FeatureFilterSelectMSR; =20 # datatypes.h vir_domain_checkpoint_get_type; +vir_domain_snapshot_get_type; virConnectClass; virConnectCloseCallbackDataCall; virConnectCloseCallbackDataClass; @@ -1354,7 +1355,6 @@ virConnectCloseCallbackDataGetCallback; virConnectCloseCallbackDataRegister; virConnectCloseCallbackDataUnregister; virDomainClass; -virDomainSnapshotClass; virGetConnect; virGetDomain; virGetDomainCheckpoint; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9b353c6f07..46851d063e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15846,8 +15846,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, cfg->snapshotDir) < 0) { /* if writing of metadata fails, error out rather than trying * to silently carry on without completing the snapshot */ - virObjectUnref(snapshot); - snapshot =3D NULL; + g_clear_object(&snapshot); virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to save metadata for snapshot %s"), snap->def->name); diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index c8fba3dc2b..bca3b33e80 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -197,6 +197,7 @@ my %gobject_impl =3D ( virAdmClient =3D> 1, virAdmServer =3D> 1, virDomainCheckpoint =3D> 1, + virDomainSnapshot =3D> 1, ); =20 sub use_gobject { --=20 2.25.3