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=1587477061; cv=none; d=zohomail.com; s=zohoarc; b=L6zvZ5UA9h67wmHYGTIS7OGyccVj01V6UzKrSz0L4hBIluFmxwhh9q+R7urhxnctRfSt/3rMlKmzVPycGsaiHLP9yk1wKm2IkWM4ucBHDdzPBLmcRPRic6otHC5qYyZIMPiSLFtDDUtVq7su/SWhdXk0fJK0LmDm07etLfXJ9IQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587477061; 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=kKSzlO80Jb9C1oBM9KusZEcAVMqgZv9AXzZ7YbSY+5k=; b=DqXeuJFU9KN8Prx3YWjNLwpuGQPT2Hq8CSamdSpuk65wt0E0AQZrspr5lj3CxlEDMFjJVZpGmtWAjgqukYPFR6PENFqQJjclmJPOFmcYsKaId88svoBVaJdjpQJGL8n846NDiDGD7AEIjTn//I3gPkiwHE86lsz7S1ZtzqYjqEw= 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 1587477061902833.9240511420259; Tue, 21 Apr 2020 06:51: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-491-d0X_JY-fONejoSDt4Xuuww-1; Tue, 21 Apr 2020 09:50:58 -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 27E3C149D7; Tue, 21 Apr 2020 13:50:50 +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 EDA4528980; Tue, 21 Apr 2020 13:50:49 +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 A200D18034EE; Tue, 21 Apr 2020 13:50:49 +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 03LDoUjj003433 for ; Tue, 21 Apr 2020 09:50:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 49F432024517; Tue, 21 Apr 2020 13:50:30 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 45FCC2093CE5 for ; Tue, 21 Apr 2020 13:50:30 +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 232858FF689 for ; Tue, 21 Apr 2020 13:50:30 +0000 (UTC) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-87-mBP38wupOUWJetTbxukQNA-1; Tue, 21 Apr 2020 09:50:27 -0400 Received: by mail-wr1-f45.google.com with SMTP id b11so16531474wrs.6 for ; Tue, 21 Apr 2020 06:50:26 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 06:50:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587477060; 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=kKSzlO80Jb9C1oBM9KusZEcAVMqgZv9AXzZ7YbSY+5k=; b=NlWs1EkUfD4dWXCM4BYgGkAQxWH+b5UsTbnl8qnBToiFQQnedRyM8Ads1Q/UGDoOsIKloA 7kSqXg0Bd4OLAZ+5PaKvtaYjFiVUzT3FuONjdh3svm+8k9vHDpnjjkKe004Nj6b7uKFVSO EZlCMFCd+f/WLVDkhQNmTX/U6Wq3sXw= X-MC-Unique: d0X_JY-fONejoSDt4Xuuww-1 X-MC-Unique: mBP38wupOUWJetTbxukQNA-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=mWwT33ZDM4MCR51S9GS7o/a8X64V2+UhaEyrd55hMZ4=; b=c73b3qyubMMEQVy0TzaobWnplGEI4ik+G7krzekzEDhGLkXhPnQBqkz89JwbP4sso0 x5IlBdCC2ZtYa3bQvXrZsnNceDT+zP5nkS3OSQ3eUk+m115eYtMDfL4XcA+cVQElpDHV AcWF8BUJ8x/ua/8LSJyQrsv+YKdaPWpegNzosGclqIgBoMjXgB9GeGqdwYU8zlPzI2pX wVnk4tgLP9XpvqILLvhg6F0ty951w3mCQ04ku513DMt846ZqQUmDNF6G5GPUtKFJUHMm Yv2JjKTpL9pN/8KB4gtLtqcZ9D+msIz1/HPo9nJaFFXfSRszR82x/fAHVS+zJlznjZOK XPzA== X-Gm-Message-State: AGi0PuZhT6wHOYj1j287y+BuDJ5UqdXmRPLqRrN31lg4egVZhEqbvKjf X8E+MT85gS1Wn+2MH2/SteNG3nfS3tY= X-Google-Smtp-Source: APiQypL+QRhH9EFyotpmUErNDkdNTO0Htq4/3FSRxoKpzQbocQMpUz/NM6Eybg+HWlKM7rGEndLm0Q== X-Received: by 2002:adf:e586:: with SMTP id l6mr20177388wrm.184.1587477024945; Tue, 21 Apr 2020 06:50:24 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH v2 19/40] datatypes: convert virNWFilter to GObject Date: Tue, 21 Apr 2020 15:49:00 +0200 Message-Id: <20200421134921.3717019-20-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 03LDoUjj003433 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/virnwfilterobj.c | 7 +--- src/datatypes.c | 70 +++++++++++++++++++++++++++------------ src/datatypes.h | 10 +++--- src/libvirt-nwfilter.c | 7 ++-- src/libvirt_private.syms | 2 +- src/rpc/gendispatch.pl | 1 + 6 files changed, 60 insertions(+), 37 deletions(-) diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index c9e224061d..c08dc7a5d6 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -472,12 +472,7 @@ virNWFilterObjListExport(virConnectPtr conn, ret =3D nfilters; =20 cleanup: - if (tmp_filters) { - for (i =3D 0; i < nfilters; i ++) - virObjectUnref(tmp_filters[i]); - } - VIR_FREE(tmp_filters); - + virGObjectListFreeCount(tmp_filters, nfilters); return ret; } =20 diff --git a/src/datatypes.c b/src/datatypes.c index 334d9d8638..e9f6cafd72 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); @@ -97,6 +95,24 @@ 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 virNWFilterDispose(GObject *obj); +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->dispose =3D virNWFilterDispose; + obj->finalize =3D virNWFilterFinalize; +} + virClassPtr virAdmConnectClass; virClassPtr virAdmConnectCloseCallbackDataClass; =20 @@ -155,7 +171,6 @@ virDataTypesOnceInit(void) DECLARE_CLASS(virNetwork); DECLARE_CLASS(virNetworkPort); DECLARE_CLASS(virNodeDevice); - DECLARE_CLASS(virNWFilter); DECLARE_CLASS(virNWFilterBinding); DECLARE_CLASS(virSecret); DECLARE_CLASS(virStream); @@ -889,7 +904,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. */ @@ -897,17 +912,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 @@ -915,11 +929,7 @@ 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 @@ -927,23 +937,39 @@ virGetNWFilter(virConnectPtr conn, const char *name, * virNWFilterDispose: * @obj: the network filter to release * - * Unconditionally release all memory associated with a nwfilter. - * The nwfilter 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 +virNWFilterDispose(GObject *obj) +{ + virNWFilterPtr nwfilter =3D VIR_NW_FILTER(obj); + + virObjectUnref(nwfilter->conn); + nwfilter->conn =3D NULL; + + G_OBJECT_CLASS(vir_nw_filter_parent_class)->dispose(obj); +} + +/** + * virNWFilterFinalize: + * @obj: the network filter 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 nwfilter. + * The nwfilter object must not be used once this method returns. */ 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); VIR_DEBUG("release nwfilter %p %s %s", nwfilter, nwfilter->name, uuids= tr); =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 9dfb18147e..b51514d579 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; @@ -57,6 +56,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() @@ -311,8 +313,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 (_nw =3D=3D NULL || \ !virObjectIsClass(_nw->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_NWFILTER, \ VIR_ERR_INVALID_NWFILTER, \ @@ -784,7 +786,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 33d6d4950d..44ffeb6abc 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1348,6 +1348,7 @@ virCPUx86FeatureFilterSelectMSR; # datatypes.h vir_domain_checkpoint_get_type; vir_domain_snapshot_get_type; +vir_nw_filter_get_type; virConnectClass; virConnectCloseCallbackDataCall; virConnectCloseCallbackDataClass; @@ -1374,7 +1375,6 @@ virNetworkClass; virNetworkPortClass; virNewConnectCloseCallbackData; virNodeDeviceClass; -virNWFilterClass; virSecretClass; virStoragePoolClass; virStorageVolClass; diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index bca3b33e80..b51e2715ee 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -198,6 +198,7 @@ my %gobject_impl =3D ( virAdmServer =3D> 1, virDomainCheckpoint =3D> 1, virDomainSnapshot =3D> 1, + virNWFilter =3D> 1, ); =20 sub use_gobject { --=20 2.25.3