From nobody Mon Feb 9 07:07:30 2026 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=1585927031; cv=none; d=zohomail.com; s=zohoarc; b=UXrd23jGGzWVGL6KkvNI+TgpEfgPVsAoyC0BU//t4nwJ9RR8cYk3gtve7FiKCnluc6uWA8SCSbg5LX+HuPhQrFQKKHGXMA7CeZ01B+qPrJSWNj97ofjtbJ73dwUeQ2ZOHfEuZySTUPGDN9bzRba9EtS7w1cfbsZKjtilzzZg5lc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585927031; 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=NlRSyTkD1kcFgewD+0Y5oEcg2woCZAyBtdY5fsihZjw=; b=jTYJsM7GmVFOf+ZSk1SaBe0QC2N+wADz0AHmK7fBmcSEMC/5jS/KnscmkG7LJkHVrGUTLTSVdZggqwY8iX255E+6CfuJR7DLTrttadfdI7PvHP6bOMlNY/kjC8jgJPo0jNCay4MRJ8tbvIGhElQ9RFOTg15toNpA729a1EQSQxc= 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-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1585927031212428.86959439799057; Fri, 3 Apr 2020 08:17:11 -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-295-cZZa6ULzMMiJZjLxQdNaMg-1; Fri, 03 Apr 2020 11:17:07 -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 D33BC107ACC9; Fri, 3 Apr 2020 15:16:57 +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 A62E660BF3; Fri, 3 Apr 2020 15:16:57 +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 5E86018034E9; Fri, 3 Apr 2020 15:16:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 033FGjWi028231 for ; Fri, 3 Apr 2020 11:16:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id DA4D1123CD57; Fri, 3 Apr 2020 15:16:45 +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 D6566123CD4F for ; Fri, 3 Apr 2020 15:16:45 +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-mx02.redhat.com (Postfix) with ESMTPS id BC843185A78E for ; Fri, 3 Apr 2020 15:16:45 +0000 (UTC) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-420-4j1hOJzLPMG6hxTLBrRZKg-1; Fri, 03 Apr 2020 11:16:43 -0400 Received: by mail-wr1-f50.google.com with SMTP id h15so8946655wrx.9 for ; Fri, 03 Apr 2020 08:16:42 -0700 (PDT) Received: from localhost.localdomain (public-gprs375156.centertel.pl. [37.47.96.181]) by smtp.gmail.com with ESMTPSA id p13sm12331045wru.3.2020.04.03.08.16.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 08:16:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585927029; 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=NlRSyTkD1kcFgewD+0Y5oEcg2woCZAyBtdY5fsihZjw=; b=d1d1CLrpabi/DGhQP9hsppixJLRmozVBsQ0IYS5brVIWtcteloEd9rpirnkhX1jzetKJK9 zcxAGQ7BmzQbXRcjzMMfvbOckIJQWtVhXB2lJFRsYEEyt9G+tt1XeCZ4qHRK45ZhC0P93u hZ+4lFcHbgvkxBjR3Vg7z0VONPLfis8= X-MC-Unique: cZZa6ULzMMiJZjLxQdNaMg-1 X-MC-Unique: 4j1hOJzLPMG6hxTLBrRZKg-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=uvfr+RWC1EwJhDszf9qvvESSqgDhg9nKiAaZcOsM0m4=; b=dg7CXZLu3dozInJ+JR5RlJ+GgKy6/7UJ+MSoek12RWUsK/MlI3Pj7Hj7pyHdxbezhe rjx3MkTr2xSeMsj/zF54DyfpZcirUTNNdV13qgXcyArxKReiu7tSBXkaVoUh3ghSPBmb 1oHQNDN2SEVT72wnUYJI570zcUspUmGRnc+nM/7sx22miFnmOjC3yjpqXN8bhY2IzyTw cTAJ4cS5cf9FZtlnlWkWeHnfthxwh2lLc8s47fxua1v9VkgMEk6NagvCWT/lOixu4A9X banPe0T2GgQie93oM7ib8CFM1zn5n86qdiWEg3zuk/Xs9xa+ccD54ZRp6HByLjYBKQsQ D2ag== X-Gm-Message-State: AGi0PubHNVK+qMmVGdayrY0mwrtPvUDpeeaKEPgmMlDz+lLrnrbNwovl lXbge15Ki9Kd0haopqydsYptgJ6ubuo= X-Google-Smtp-Source: APiQypJmotrLN0nA6NH8FauE1PmpCz128CMYDy5aTcnXdfcwP1OTLO0kZXv34CkZy6lMlkFfSk1WJQ== X-Received: by 2002:a05:6000:370:: with SMTP id f16mr9948391wrf.9.1585927001365; Fri, 03 Apr 2020 08:16:41 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH 17/36] datatypes: convert virNWFilter to GObject Date: Fri, 3 Apr 2020 17:15:45 +0200 Message-Id: <20200403151604.106616-18-r4f4rfs@gmail.com> In-Reply-To: <20200403151604.106616-1-r4f4rfs@gmail.com> References: <20200403151604.106616-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 033FGjWi028231 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/virnwfilterobj.c | 6 +++-- src/datatypes.c | 46 ++++++++++++++++++++++++--------------- src/datatypes.h | 10 +++++---- src/libvirt-nwfilter.c | 7 +++--- src/libvirt_private.syms | 1 - 5 files changed, 41 insertions(+), 29 deletions(-) diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index c9e224061d..6d89701199 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -473,8 +473,10 @@ virNWFilterObjListExport(virConnectPtr conn, =20 cleanup: if (tmp_filters) { - for (i =3D 0; i < nfilters; i ++) - virObjectUnref(tmp_filters[i]); + for (i =3D 0; i < nfilters; i ++) { + if (tmp_filters[i]) + g_object_unref(tmp_filters[i]); + } } VIR_FREE(tmp_filters); =20 diff --git a/src/datatypes.c b/src/datatypes.c index fd39c96b31..d4f60db2be 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -40,7 +40,6 @@ virClassPtr virInterfaceClass; virClassPtr virNetworkClass; virClassPtr virNetworkPortClass; virClassPtr virNodeDeviceClass; -virClassPtr virNWFilterClass; virClassPtr virNWFilterBindingClass; virClassPtr virSecretClass; virClassPtr virStreamClass; @@ -54,7 +53,6 @@ static void virInterfaceDispose(void *obj); static void virNetworkDispose(void *obj); static void virNetworkPortDispose(void *obj); static void virNodeDeviceDispose(void *obj); -static void virNWFilterDispose(void *obj); static void virNWFilterBindingDispose(void *obj); static void virSecretDispose(void *obj); static void virStreamDispose(void *obj); @@ -93,6 +91,22 @@ vir_domain_snapshot_class_init(virDomainSnapshotClass *k= lass) obj->finalize =3D virDomainSnapshotFinalize; } =20 +G_DEFINE_TYPE(virNWFilter, vir_nw_filter, G_TYPE_OBJECT); +static void virNWFilterFinalize(GObject *obj); + +static void +vir_nw_filter_init(virNWFilter *filter G_GNUC_UNUSED) +{ +} + +static void +vir_nw_filter_class_init(virNWFilterClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->finalize =3D virNWFilterFinalize; +} + virClassPtr virAdmConnectClass; virClassPtr virAdmConnectCloseCallbackDataClass; =20 @@ -149,7 +163,6 @@ virDataTypesOnceInit(void) DECLARE_CLASS(virNetwork); DECLARE_CLASS(virNetworkPort); DECLARE_CLASS(virNodeDevice); - DECLARE_CLASS(virNWFilter); DECLARE_CLASS(virNWFilterBinding); DECLARE_CLASS(virSecret); DECLARE_CLASS(virStream); @@ -883,7 +896,7 @@ virStreamDispose(void *obj) * @uuid: pointer to the uuid * * Allocates a new network filter 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 network filter object, or NULL on error. */ @@ -891,17 +904,16 @@ virNWFilterPtr virGetNWFilter(virConnectPtr conn, const char *name, const unsigned char *uuid) { - virNWFilterPtr ret =3D NULL; + g_autoptr(virNWFilter) 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(virNWFilterClass))) - goto error; + ret =3D VIR_NW_FILTER(g_object_new(VIR_TYPE_NW_FILTER, NULL)); =20 ret->name =3D g_strdup(name); =20 @@ -909,16 +921,12 @@ virGetNWFilter(virConnectPtr conn, const char *name, =20 ret->conn =3D virObjectRef(conn); =20 - return ret; - - error: - virObjectUnref(ret); - return NULL; + return g_steal_pointer(&ret); } =20 =20 /** - * virNWFilterDispose: + * virNWFilterFinalize: * @obj: the network filter to release * * Unconditionally release all memory associated with a nwfilter. @@ -928,9 +936,9 @@ virGetNWFilter(virConnectPtr conn, const char *name, * which may also be released if its ref count hits zero. */ static void -virNWFilterDispose(void *obj) +virNWFilterFinalize(GObject *obj) { - virNWFilterPtr nwfilter =3D obj; + virNWFilterPtr nwfilter =3D VIR_NW_FILTER(obj); char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 virUUIDFormat(nwfilter->uuid, uuidstr); @@ -938,6 +946,8 @@ virNWFilterDispose(void *obj) =20 VIR_FREE(nwfilter->name); virObjectUnref(nwfilter->conn); + + G_OBJECT_CLASS(vir_nw_filter_parent_class)->finalize(obj); } =20 =20 diff --git a/src/datatypes.h b/src/datatypes.h index 296196523b..e8bd9bf1e5 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -36,7 +36,6 @@ extern virClassPtr virInterfaceClass; extern virClassPtr virNetworkClass; extern virClassPtr virNetworkPortClass; extern virClassPtr virNodeDeviceClass; -extern virClassPtr virNWFilterClass; extern virClassPtr virNWFilterBindingClass; extern virClassPtr virSecretClass; extern virClassPtr virStreamClass; @@ -58,6 +57,9 @@ G_DECLARE_FINAL_TYPE(virDomainSnapshot, DOMAIN_SNAPSHOT, GObject); =20 +#define VIR_TYPE_NW_FILTER vir_nw_filter_get_type() +G_DECLARE_FINAL_TYPE(virNWFilter, vir_nw_filter, VIR, NW_FILTER, GObject); + extern virClassPtr virAdmConnectClass; =20 #define VIR_TYPE_ADM_SERVER vir_adm_server_get_type() @@ -312,8 +314,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); =20 #define virCheckNWFilterReturn(obj, retval) \ do { \ - virNWFilterPtr _nw =3D (obj); \ - if (!virObjectIsClass(_nw, virNWFilterClass) || \ + virNWFilterPtr _nw =3D VIR_NW_FILTER(obj); \ + if (!G_IS_OBJECT(_nw) || !(G_OBJECT_TYPE(_nw) =3D=3D VIR_TYPE_NW_F= ILTER) || \ !virObjectIsClass(_nw->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_NWFILTER, \ VIR_ERR_INVALID_NWFILTER, \ @@ -785,7 +787,7 @@ struct _virDomainSnapshot { * Internal structure associated to a network filter */ struct _virNWFilter { - virObject parent; + GObject parent; virConnectPtr conn; /* pointer back to the connection= */ char *name; /* the network filter external na= me */ unsigned char uuid[VIR_UUID_BUFLEN]; /* the network filter unique iden= tifier */ diff --git a/src/libvirt-nwfilter.c b/src/libvirt-nwfilter.c index d28220db8a..cd3f5759b7 100644 --- a/src/libvirt-nwfilter.c +++ b/src/libvirt-nwfilter.c @@ -281,7 +281,7 @@ virNWFilterFree(virNWFilterPtr nwfilter) =20 virCheckNWFilterReturn(nwfilter, -1); =20 - virObjectUnref(nwfilter); + g_object_unref(nwfilter); return 0; } =20 @@ -503,14 +503,13 @@ virNWFilterGetXMLDesc(virNWFilterPtr nwfilter, unsign= ed int flags) int virNWFilterRef(virNWFilterPtr nwfilter) { - VIR_DEBUG("nwfilter=3D%p refs=3D%d", nwfilter, - nwfilter ? nwfilter->parent.u.s.refs : 0); + VIR_DEBUG("nwfilter=3D%p", nwfilter); =20 virResetLastError(); =20 virCheckNWFilterReturn(nwfilter, -1); =20 - virObjectRef(nwfilter); + g_object_ref(nwfilter); return 0; } =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7528779127..aff0688548 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1369,7 +1369,6 @@ virNetworkClass; virNetworkPortClass; virNewConnectCloseCallbackData; virNodeDeviceClass; -virNWFilterClass; virSecretClass; virStoragePoolClass; virStorageVolClass; --=20 2.25.1