From nobody Mon Feb 9 04:29:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1589371133; cv=none; d=zohomail.com; s=zohoarc; b=azVUiJJdZI6PdX5bn9F6D5gq+9tjitYfYHVZ/PUvWJSZecoGEI+ydtg4lRIyKHO5kCte8uQephyMTzuC69td2AJT5fEKHorvqCNGwSsGCK+QReCfORVO8lxPFbY52Y38LcE649H5DpUZ8XAH/xfk2Oe3iy9r3Kz31TaTP9Toxro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589371133; 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=XMpE6b2PY97NLWcPwqOiftu9RuNKNT8+bDythFvFkeo=; b=fKiOqB3hpdPjm5sdMvNTZpBmkzjLso/usrlGGE3eUi660/1/cB+8W7OOK/QOoHpcT/U96HTMbftSMnStbhm1f6BlDUBI4TCTsqN+IERP6z3BJkenSjzJ7u+14utLEos1OI5/6KTJHbln9zMjEmpBIxIiHjdw9WQBYFskzFON/Tk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1589371133283942.4797304773862; Wed, 13 May 2020 04:58:53 -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-418-RB3_kPsvOJWwEMw2WnF3rg-1; Wed, 13 May 2020 07:58:49 -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 59146876E05; Wed, 13 May 2020 11:58:44 +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 3773A6E6F9; Wed, 13 May 2020 11:58:44 +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 0780F1809547; Wed, 13 May 2020 11:58:44 +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 04DBwgV4016196 for ; Wed, 13 May 2020 07:58:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1A08A110EB4; Wed, 13 May 2020 11:58:42 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 13E215EDD7 for ; Wed, 13 May 2020 11:58:42 +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 EACA0101A526 for ; Wed, 13 May 2020 11:58:41 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-90-3X3LYrTVMhqPcn4WfAC72A-1; Wed, 13 May 2020 07:58:38 -0400 Received: by mail-wr1-f66.google.com with SMTP id j5so20559141wrq.2 for ; Wed, 13 May 2020 04:58:38 -0700 (PDT) Received: from localhost.localdomain (public-gprs367127.centertel.pl. [37.47.65.88]) by smtp.gmail.com with ESMTPSA id l1sm27838422wrc.24.2020.05.13.04.58.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2020 04:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589371131; 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=XMpE6b2PY97NLWcPwqOiftu9RuNKNT8+bDythFvFkeo=; b=PtzIfK0lWjtx7RgMBzInrEYxtio0X6nGM2ignPz95v7voidD7XYASOWn1AI8oSsaBJq/Z0 USq6LRFkEM8X2ZotJQZnCIt0fScUVKm/pnAt4Sr1/XmhgBMHUq7CyGTGSbD9IyVeeWbwDs 4Eo5qfj9dIhfSzV48fbMU8GMquZoFm8= X-MC-Unique: RB3_kPsvOJWwEMw2WnF3rg-1 X-MC-Unique: 3X3LYrTVMhqPcn4WfAC72A-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=XMpE6b2PY97NLWcPwqOiftu9RuNKNT8+bDythFvFkeo=; b=lnZ5xfD2GPHpRStTUG+f86Cbr573J15O6PNJPtQrZqZMqiI2K3FgKcrnRf88E6h82x L9A1Y+nOhzFascv+63PyUdFz+d7mmblBcJlFvNdbXOBU+QAdb0iYWBLtNyo2osIolEPW iv4YJhW5cTEzsZhzS+6gXRimoWeU+yW93EEGoH+1pmdowRC/TNbeorzRCmWL34GNqpzR oDtH6gpz9n4t/A/94tXjzX4x6YpyDrDX+/DXxLMJxryn1X3dRu7z/ope+aU6EdZTcOEq +BDFl+m6Z6CHPbtx3V9vF1ITMTLTNTJwwQ16XmngwbfZQzXnkhqvcQcS7Q8H/V0UWY+e 3Huw== X-Gm-Message-State: AGi0PubZQWzJ84UKquc7rY0drZsR+GZSZTCHxHbWru29vhaRZSehSz4M OtTmwuA1GXmOgaTPkuuQBJFrpY1I X-Google-Smtp-Source: APiQypLSbIScx0jv6VJfdfxGC7JC6ibpvTQioZ1BacoYzfIpOKeJ/hLb1cD4iVBg0Wdt4ixTeXTm3w== X-Received: by 2002:adf:e788:: with SMTP id n8mr29504692wrm.317.1589371116916; Wed, 13 May 2020 04:58:36 -0700 (PDT) From: Rafael Fonseca To: libvirt-list@redhat.com Subject: [PATCH 22/40] datatypes: convert virNetworkPort to GObject Date: Wed, 13 May 2020 13:57:06 +0200 Message-Id: <20200513115724.157687-23-r4f4rfs@gmail.com> In-Reply-To: <20200513115724.157687-1-r4f4rfs@gmail.com> References: <20200513115724.157687-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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/domain_conf.c | 6 ++-- src/conf/virnetworkobj.c | 5 +--- src/datatypes.c | 46 ++++++++++++++++++----------- src/datatypes.h | 15 +++++----- src/libvirt-network.c | 7 ++--- src/libvirt_private.syms | 2 +- src/remote/remote_daemon_dispatch.c | 7 ++--- src/remote/remote_driver.c | 4 +-- src/rpc/gendispatch.pl | 1 + 9 files changed, 47 insertions(+), 46 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5f677d5bb3..f7392fce05 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -31883,7 +31883,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 */ @@ -31902,7 +31902,6 @@ virDomainNetReleaseActualDevice(virConnectPtr conn, goto cleanup; =20 cleanup: - virObjectUnref(port); return ret; } =20 @@ -31956,7 +31955,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; @@ -31981,7 +31980,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 2d375deb47..946008cb5e 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1821,10 +1821,7 @@ virNetworkObjPortListExport(virNetworkPtr net, =20 ret =3D data.nports; cleanup: - while (data.ports && data.nports) - virObjectUnref(data.ports[--data.nports]); - - VIR_FREE(data.ports); + virGObjectListFreeCount(data.ports, data.nports); return ret; } =20 diff --git a/src/datatypes.c b/src/datatypes.c index 3889ece17e..3cad8f2bc6 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,36 +495,31 @@ 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; =20 - virCheckNetworkGoto(net, error); - virCheckNonNullArgGoto(uuid, error); + virCheckNetworkReturn(net, NULL); + virCheckNonNullArgReturn(uuid, NULL); =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; - - error: - virObjectUnref(ret); - return NULL; + return g_steal_pointer(&ret); } =20 /** - * virNetworkPortDispose: + * virNetworkPortFinalize: * @obj: the network port to release * * Unconditionally release all memory associated with a network port. @@ -521,15 +529,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_clear_object(&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 706cec340f..41f366d21a 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; @@ -57,6 +56,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 @@ -146,8 +148,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 (_port =3D=3D NULL || \ !VIR_IS_NETWORK(_port->net)) { \ virReportErrorHelper(VIR_FROM_NETWORK, \ VIR_ERR_INVALID_NETWORK_PORT, \ @@ -160,8 +162,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 (_port =3D=3D NULL || \ !VIR_IS_NETWORK(_port->net)) { \ virReportErrorHelper(VIR_FROM_NETWORK, \ VIR_ERR_INVALID_NETWORK_PORT, \ @@ -654,12 +656,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 a7255d6f18..782d9c1eac 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1359,6 +1359,7 @@ virCPUx86FeatureFilterSelectMSR; vir_domain_checkpoint_get_type; vir_domain_snapshot_get_type; vir_network_get_type; +vir_network_port_get_type; vir_nw_filter_binding_get_type; vir_nw_filter_get_type; virConnectClass; @@ -1383,7 +1384,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 4add62bb86..d5c5ab9aab 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -7170,7 +7170,7 @@ remoteDispatchNetworkPortGetParameters(virNetServerPt= r server G_GNUC_UNUSED, remote_network_port_get_parameters_= ret *ret) { int rv =3D -1; - virNetworkPortPtr port =3D NULL; + g_autoptr(virNetworkPort) port =3D NULL; virTypedParameterPtr params =3D NULL; int nparams =3D 0; virConnectPtr conn =3D remoteGetNetworkConn(client); @@ -7196,7 +7196,6 @@ remoteDispatchNetworkPortGetParameters(virNetServerPt= r server G_GNUC_UNUSED, cleanup: if (rv < 0) virNetMessageSaveError(rerr); - virObjectUnref(port); virTypedParamsFree(params, nparams); return rv; } @@ -7225,13 +7224,11 @@ get_nonnull_network(virConnectPtr conn, remote_nonn= ull_network network) static virNetworkPortPtr get_nonnull_network_port(virConnectPtr conn, remote_nonnull_network_port p= ort) { - virNetworkPortPtr ret; g_autoptr(virNetwork) net =3D virGetNetwork(conn, port.net.name, BAD_CAST port.net.uuid); if (!net) return NULL; - ret =3D virGetNetworkPort(net, BAD_CAST port.uuid); - return ret; + return virGetNetworkPort(net, BAD_CAST port.uuid); } =20 static virInterfacePtr diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 283a0e9c12..48d83d5fc4 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -8268,13 +8268,11 @@ get_nonnull_network(virConnectPtr conn, remote_nonn= ull_network network) static virNetworkPortPtr get_nonnull_network_port(virConnectPtr conn, remote_nonnull_network_port p= ort) { - virNetworkPortPtr ret; g_autoptr(virNetwork) net =3D virGetNetwork(conn, port.net.name, BAD_CAST port.net.uuid); if (!net) return NULL; - ret =3D virGetNetworkPort(net, BAD_CAST port.uuid); - return ret; + return virGetNetworkPort(net, BAD_CAST port.uuid); } =20 static virInterfacePtr diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 2c101fab6d..5c14038428 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -199,6 +199,7 @@ my %gobject_impl =3D ( virDomainCheckpoint =3D> 1, virDomainSnapshot =3D> 1, virNetwork =3D> 1, + virNetworkPort =3D> 1, virNWFilter =3D> 1, virNWFilterBinding =3D> 1, ); --=20 2.26.2