From nobody Mon Feb 9 09:57:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1585927035; cv=none; d=zohomail.com; s=zohoarc; b=To9R+j1rvT+BQAGpK51gGSlQKEb7M35XHzarb0pmOTWB7kIIPo6WEcKinm1jvB/J/i02p463D+te3EIR32R6E9srN+ahi6aGWoaRfc9s2MBRP34beS4q4XXX22VfZEIndt13wOcsDFF/cmL7lpHpunT6wy9ITIFYTpBBraK3gw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585927035; 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=4V/rQpLR6jgjcUAu9KzCdkOe2rEriO4CVWUmdbpHNMg=; b=a7Q1CNW/8sUuUDWMEbA/0cSl7EVF8A0WR9I0epe8YutovwuK5qR8W/Wz9lM+T6ioyMea0m95hq29OSw0ewy+70yFnOovUok0RzPBoZBdoyN7VsaSFJvou90REpNDdhFG+FVsF+Aq6ObtsBdd9Kz9l7Krs/hpj5Vwcq8DirEzVf0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1585927035510219.48112049530891; Fri, 3 Apr 2020 08:17:15 -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-60-X6S3hDksPGON9-BP_ir0MA-1; Fri, 03 Apr 2020 11:17:10 -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 B47A6100728C; Fri, 3 Apr 2020 15:17:01 +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 8A79F26DD1; Fri, 3 Apr 2020 15:17:01 +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 4149518034EF; Fri, 3 Apr 2020 15:17:01 +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 033FGoHt028275 for ; Fri, 3 Apr 2020 11:16:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0442813CCA0; Fri, 3 Apr 2020 15:16:50 +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 0048513CCA7 for ; Fri, 3 Apr 2020 15:16:49 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.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 D6B348FF672 for ; Fri, 3 Apr 2020 15:16:49 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-454-y1k3ddQwMiGYg4Rwv9ujlw-1; Fri, 03 Apr 2020 11:16:47 -0400 Received: by mail-wr1-f65.google.com with SMTP id a25so9024254wrd.0 for ; Fri, 03 Apr 2020 08:16:47 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 08:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585927033; 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=4V/rQpLR6jgjcUAu9KzCdkOe2rEriO4CVWUmdbpHNMg=; b=SOgisQOvYxK1EB4LWA0/MSVM2RlJS0CF1vpllj9ISSdb94wah3hWyWvYHGI2FXGfrM31tR 2rK/+gt3nZ003MiJe/Wk19KLqtkRYoO+36Zm+KNsYbXtfKfHUhqvW4iva6+KvgiNs8wDre 1IDuOmv/Nv+ynIvjBExfq/41+HiW5O4= X-MC-Unique: X6S3hDksPGON9-BP_ir0MA-1 X-MC-Unique: y1k3ddQwMiGYg4Rwv9ujlw-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=0t4z8daUMPPSo1CJX7alRtdpdTvRxlFg9bfQZiirark=; b=Zu1qI6rRDp8IL5GzlaI91ldPuNK5Mt8wJfaYX667XRGmQyXmfnOoChjFke198ltB0X hxidu9AFHjX/YVeBxkq/SGPR9j2sAnBoaxHtGlvqmXEH//REsjyfUILz5n3IvSJLO37I qbySFhphhi0zuIRLO+uW+ya5q5AGx3UvXKJRHeJ/mWOuEbtJklnV81aE1oCJv9yksHCH PUG6FfiIt4OPwgpunC3rBnVW1LClyobOuNg5xEhkRplebLOg2mBx2IfxdAZs6NwAURpO uFBL7Gb2dWyJ1loNkViCRcE5Vo922+aQt0lYEPezkop8A6HxPvSXHaMX0gIUrbN8b7rC iypA== X-Gm-Message-State: AGi0Puage+NAIECOh75/ruzCswOSxoQeH1X9GoHXXrl7bds+Lf7dCd2C N81MmsVtF0Jjavj1F51MTlRkntt0iWo= X-Google-Smtp-Source: APiQypLkpHWMCh4zZ9Y6Q5SnAtKPDe5xhBc6pzwPCTd7yOb/88zQJehQBTPkwZ1ERd5xmTpkLdnoJA== X-Received: by 2002:adf:b60d:: with SMTP id f13mr10173038wre.12.1585927005838; Fri, 03 Apr 2020 08:16:45 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH 20/36] datatypes: convert virNetworkPort to GObject Date: Fri, 3 Apr 2020 17:15:48 +0200 Message-Id: <20200403151604.106616-21-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.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 033FGoHt028275 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/domain_conf.c | 6 ++--- src/conf/virnetworkobj.c | 7 +++--- src/datatypes.c | 37 +++++++++++++++++++---------- src/datatypes.h | 15 ++++++------ src/libvirt-network.c | 7 +++--- src/libvirt_private.syms | 1 - src/remote/remote_daemon_dispatch.c | 2 +- 7 files changed, 43 insertions(+), 32 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 772d9ae0a8..f3a8a36eb2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -31541,7 +31541,7 @@ virDomainNetReleaseActualDevice(virConnectPtr conn, virDomainNetDefPtr iface) { g_autoptr(virNetwork) net =3D NULL; - virNetworkPortPtr port =3D NULL; + g_autoptr(virNetworkPort) port =3D NULL; int ret =3D -1; =20 /* Port might not exist if a failure occurred during VM startup */ @@ -31560,7 +31560,6 @@ virDomainNetReleaseActualDevice(virConnectPtr conn, goto cleanup; =20 cleanup: - virObjectUnref(port); return ret; } =20 @@ -31614,7 +31613,7 @@ virDomainNetBandwidthUpdate(virDomainNetDefPtr ifac= e, virNetDevBandwidthPtr newBandwidth) { g_autoptr(virNetwork) net =3D NULL; - virNetworkPortPtr port =3D NULL; + g_autoptr(virNetworkPort) port =3D NULL; virTypedParameterPtr params =3D NULL; int nparams =3D 0; virConnectPtr conn =3D NULL; @@ -31639,7 +31638,6 @@ virDomainNetBandwidthUpdate(virDomainNetDefPtr ifac= e, cleanup: virObjectUnref(conn); virTypedParamsFree(params, nparams); - virObjectUnref(port); return ret; } =20 diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 762c9d9159..fba2587fd8 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1825,9 +1825,10 @@ virNetworkObjPortListExport(virNetworkPtr net, =20 ret =3D data.nports; cleanup: - while (data.ports && data.nports) - virObjectUnref(data.ports[--data.nports]); - + while (data.ports && data.nports) { + if (data.ports[--data.nports]) + g_object_unref(data.ports[data.nports]); + } VIR_FREE(data.ports); return ret; } diff --git a/src/datatypes.c b/src/datatypes.c index 15130ca0fa..e715c37306 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -37,7 +37,6 @@ virClassPtr virConnectClass; virClassPtr virConnectCloseCallbackDataClass; virClassPtr virDomainClass; virClassPtr virInterfaceClass; -virClassPtr virNetworkPortClass; virClassPtr virNodeDeviceClass; virClassPtr virSecretClass; virClassPtr virStreamClass; @@ -48,7 +47,6 @@ static void virConnectDispose(void *obj); static void virConnectCloseCallbackDataDispose(void *obj); static void virDomainDispose(void *obj); static void virInterfaceDispose(void *obj); -static void virNetworkPortDispose(void *obj); static void virNodeDeviceDispose(void *obj); static void virSecretDispose(void *obj); static void virStreamDispose(void *obj); @@ -103,6 +101,22 @@ vir_network_class_init(virNetworkClass *klass) obj->finalize =3D virNetworkFinalize; } =20 +G_DEFINE_TYPE(virNetworkPort, vir_network_port, G_TYPE_OBJECT); +static void virNetworkPortFinalize(GObject *obj); + +static void +vir_network_port_init(virNetworkPort *np G_GNUC_UNUSED) +{ +} + +static void +vir_network_port_class_init(virNetworkPortClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->finalize =3D virNetworkPortFinalize; +} + G_DEFINE_TYPE(virNWFilter, vir_nw_filter, G_TYPE_OBJECT); static void virNWFilterFinalize(GObject *obj); =20 @@ -188,7 +202,6 @@ virDataTypesOnceInit(void) DECLARE_CLASS_LOCKABLE(virConnectCloseCallbackData); DECLARE_CLASS(virDomain); DECLARE_CLASS(virInterface); - DECLARE_CLASS(virNetworkPort); DECLARE_CLASS(virNodeDevice); DECLARE_CLASS(virSecret); DECLARE_CLASS(virStream); @@ -482,14 +495,14 @@ virNetworkFinalize(GObject *obj) * @uuid: pointer to the uuid * * Allocates a new network port 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 network port object, or NULL on error. */ virNetworkPortPtr virGetNetworkPort(virNetworkPtr net, const unsigned char *uuid) { - virNetworkPortPtr ret =3D NULL; + g_autoptr(virNetworkPort) ret =3D NULL; =20 if (virDataTypesInitialize() < 0) return NULL; @@ -497,21 +510,19 @@ virGetNetworkPort(virNetworkPtr net, const unsigned c= har *uuid) virCheckNetworkGoto(net, error); virCheckNonNullArgGoto(uuid, error); =20 - if (!(ret =3D virObjectNew(virNetworkPortClass))) - goto error; + ret =3D VIR_NETWORK_PORT(g_object_new(VIR_TYPE_NETWORK_PORT, NULL)); =20 ret->net =3D g_object_ref(net); memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); =20 - return ret; + return g_steal_pointer(&ret); =20 error: - virObjectUnref(ret); return NULL; } =20 /** - * virNetworkPortDispose: + * virNetworkPortFinalize: * @obj: the network port to release * * Unconditionally release all memory associated with a network port. @@ -521,15 +532,17 @@ virGetNetworkPort(virNetworkPtr net, const unsigned c= har *uuid) * which may also be released if its ref count hits zero. */ static void -virNetworkPortDispose(void *obj) +virNetworkPortFinalize(GObject *obj) { - virNetworkPortPtr port =3D obj; + virNetworkPortPtr port =3D VIR_NETWORK_PORT(obj); char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 virUUIDFormat(port->uuid, uuidstr); VIR_DEBUG("release network port %p %s", port, uuidstr); =20 g_object_unref(port->net); + + G_OBJECT_CLASS(vir_network_port_parent_class)->finalize(obj); } =20 =20 diff --git a/src/datatypes.h b/src/datatypes.h index e91a6c71f4..a544a7a347 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -33,7 +33,6 @@ extern virClassPtr virConnectClass; extern virClassPtr virDomainClass; extern virClassPtr virInterfaceClass; -extern virClassPtr virNetworkPortClass; extern virClassPtr virNodeDeviceClass; extern virClassPtr virSecretClass; extern virClassPtr virStreamClass; @@ -58,6 +57,9 @@ G_DECLARE_FINAL_TYPE(virDomainSnapshot, #define VIR_TYPE_NETWORK vir_network_get_type() G_DECLARE_FINAL_TYPE(virNetwork, vir_network, VIR, NETWORK, GObject); =20 +#define VIR_TYPE_NETWORK_PORT vir_network_port_get_type() +G_DECLARE_FINAL_TYPE(virNetworkPort, vir_network_port, VIR, NETWORK_PORT, = GObject); + #define VIR_TYPE_NW_FILTER vir_nw_filter_get_type() G_DECLARE_FINAL_TYPE(virNWFilter, vir_nw_filter, VIR, NW_FILTER, GObject); =20 @@ -147,8 +149,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); =20 #define virCheckNetworkPortReturn(obj, retval) \ do { \ - virNetworkPortPtr _port =3D (obj); \ - if (!virObjectIsClass(_port, virNetworkPortClass) || \ + virNetworkPortPtr _port =3D VIR_NETWORK_PORT(obj); \ + if (!G_IS_OBJECT(_port) || !(G_OBJECT_TYPE(_port) =3D=3D VIR_TYPE_= NETWORK_PORT) || \ !G_IS_OBJECT(_port->net) || !(G_OBJECT_TYPE(_port->net) =3D=3D= VIR_TYPE_NETWORK)) { \ virReportErrorHelper(VIR_FROM_NETWORK, \ VIR_ERR_INVALID_NETWORK_PORT, \ @@ -161,8 +163,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); =20 #define virCheckNetworkPortGoto(obj, label) \ do { \ - virNetworkPortPtr _port =3D (obj); \ - if (!virObjectIsClass(_port, virNetworkPortClass) || \ + virNetworkPortPtr _port =3D VIR_NETWORK_PORT(obj); \ + if (!G_IS_OBJECT(_port) || !(G_OBJECT_TYPE(_port) =3D=3D VIR_TYPE_= NETWORK_PORT) || \ !G_IS_OBJECT(_port->net) || !(G_OBJECT_TYPE(_port->net) =3D=3D= VIR_TYPE_NETWORK)) { \ virReportErrorHelper(VIR_FROM_NETWORK, \ VIR_ERR_INVALID_NETWORK_PORT, \ @@ -655,12 +657,11 @@ struct _virNetwork { * Internal structure associated to a network port */ struct _virNetworkPort { - virObject parent; + GObject parent; virNetworkPtr net; /* pointer back to the connection= */ unsigned char uuid[VIR_UUID_BUFLEN]; /* the network unique identifier = */ }; =20 -G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetworkPort, virObjectUnref); =20 =20 /** diff --git a/src/libvirt-network.c b/src/libvirt-network.c index 3847617d4d..1ab499fb18 100644 --- a/src/libvirt-network.c +++ b/src/libvirt-network.c @@ -1688,7 +1688,7 @@ virNetworkPortFree(virNetworkPortPtr port) =20 virCheckNetworkPortReturn(port, -1); =20 - virObjectUnref(port); + g_object_unref(port); return 0; } =20 @@ -1713,13 +1713,12 @@ virNetworkPortFree(virNetworkPortPtr port) int virNetworkPortRef(virNetworkPortPtr port) { - VIR_DEBUG("port=3D%p refs=3D%d", port, - port ? port->parent.u.s.refs : 0); + VIR_DEBUG("port=3D%p", port); =20 virResetLastError(); =20 virCheckNetworkPortReturn(port, -1); =20 - virObjectRef(port); + g_object_ref(port); return 0; } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8293a5e88d..9530b7a254 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1365,7 +1365,6 @@ virGetStoragePool; virGetStorageVol; virGetStream; virInterfaceClass; -virNetworkPortClass; virNewConnectCloseCallbackData; virNodeDeviceClass; virSecretClass; diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index ee6bbb24d0..9f5aee07cd 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -7199,7 +7199,7 @@ remoteDispatchNetworkPortGetParameters(virNetServerPt= r server G_GNUC_UNUSED, cleanup: if (rv < 0) virNetMessageSaveError(rerr); - virObjectUnref(port); + g_object_unref(port); virTypedParamsFree(params, nparams); return rv; } --=20 2.25.1