From nobody Mon Feb 9 23:19:48 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=1585927030; cv=none; d=zohomail.com; s=zohoarc; b=isEPTFcGZnv8tBgRUwHCmAxomTVKZr3h28mjw29WbRXK8QUNxJSE8p7J7D8BEEygTJcyyFzEXuOttsIyq/tvthrfckM880Y409fZCys/wmHjHfshWGOfK/D3Vr7l7LR+OGZdYzJnu+iIeyJRywt4XUj/jhxrd80AveSLs/6lWoY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585927030; 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=P91mAPh4eMbmnofPemQOy/AyZkgeZOFXD04r03tfuUQ=; b=ea73SnaTrooM/9ym2yZUJZhvRZPMx3MBR1sXganCi9BUfx6a+8AJ5V6cBJEc7bL42rkP2uTv1vjTYe1gp5yREMlo/eENcIQmDcq/Pi6cTInxmqSXij970XRKvYbXxoRsuoAFdcYjh6BHH+kmJHrQkugbSAmAlGDWqpw5yibz85g= 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 1585927030192883.0298803963416; Fri, 3 Apr 2020 08:17:10 -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-398-qnZTS9adO8K1FP7FyYhRJQ-1; Fri, 03 Apr 2020 11:17:02 -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 1179C18C35B5; Fri, 3 Apr 2020 15:16:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D323F26DEE; Fri, 3 Apr 2020 15:16:55 +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 8D3E44E45C; Fri, 3 Apr 2020 15:16:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 033FGq9M028290 for ; Fri, 3 Apr 2020 11:16:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6A0102166B30; Fri, 3 Apr 2020 15:16:52 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 661F12166B2C for ; Fri, 3 Apr 2020 15:16:49 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.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 62AEB8007A4 for ; Fri, 3 Apr 2020 15:16:49 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-385-3u4IWFF6OeaU8Y9n4MySqw-1; Fri, 03 Apr 2020 11:16:46 -0400 Received: by mail-wr1-f49.google.com with SMTP id h9so8971136wrc.8 for ; Fri, 03 Apr 2020 08:16:46 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 08:16:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585927028; 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=P91mAPh4eMbmnofPemQOy/AyZkgeZOFXD04r03tfuUQ=; b=ByKtZyX5AAGT4Bo1qacByfI0r1kgUzkXeho0XGyYO1DP/+nyB/FzICpXfoiOEY/TqoCt7u Sbpaux2/LknzTsy0AmQzWMuEhuS8jIWxyg5Mi5THPj9lYlSszSthW3bhjg6HckOGeJQic7 mWJkPdJmZO2OJs+UUIDm6Q2z7AtKdfU= X-MC-Unique: qnZTS9adO8K1FP7FyYhRJQ-1 X-MC-Unique: 3u4IWFF6OeaU8Y9n4MySqw-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=idU6FBLFQZGwboysPDxAcTBq2YpqH5e+RLEn4w3VM6U=; b=qDfo+2ZRxkMC4B+h0Y3EgmTlq4mkkTLrQBI5BCkXWHwRgFyz2bOhQeX4gr3HLoqta/ 4/KXYfW7gwgUfnrmZ4K5ym4ECAZJitvCjpFQ+l8eCxje7wG+Pp6IiQe//OaVQROfWWpo /ffucrNINlea8oG5ASAXDMnP72NxtgJuOzA05slf1zHixMKcoiv8SzSElaRFpSDcDxDM wop2b3DhbXHZBJnhYiv6SQWnkX4byjVT/izez5W3L4ma9IPf8ld1Uugpl4599YInUHlc ZQRZXgRlf+ChW6XbHXP8a+libNkkBnUe+7i9LXINeb55glQ+aNX7yVxCJMu9rLSr4AAo 1mgQ== X-Gm-Message-State: AGi0PuYpYRz1QTl6fxNVHoWXlqH1W0bouKs1mwBqcRZYEqZsVMnfMZf0 PXt30admchNfO2IsjnN+H6yA16+sQZU= X-Google-Smtp-Source: APiQypJJIEoQi2JFr9+bjm+BVcD/u+ehy3NGbUPGcn4Ms1DdzQDv7ZKJPhSkmaceSxeI4KHIKqKeng== X-Received: by 2002:a5d:540c:: with SMTP id g12mr10115952wrv.178.1585927004543; Fri, 03 Apr 2020 08:16:44 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH 19/36] datatypes: convert virNetwork to GObject Date: Fri, 3 Apr 2020 17:15:47 +0200 Message-Id: <20200403151604.106616-20-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.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 033FGq9M028290 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/network_event.c | 2 +- src/conf/virnetworkobj.c | 7 ++-- src/datatypes.c | 50 +++++++++++++++++------------ src/datatypes.h | 33 ++++++++++--------- src/libvirt-network.c | 7 ++-- src/libvirt_private.syms | 1 - src/libxl/libxl_conf.c | 3 +- src/libxl/xen_common.c | 2 +- src/remote/remote_daemon_dispatch.c | 6 ++-- src/remote/remote_driver.c | 4 +-- 11 files changed, 64 insertions(+), 57 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a29e6681a5..772d9ae0a8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -31540,7 +31540,7 @@ virDomainNetReleaseActualDevice(virConnectPtr conn, virDomainDefPtr dom G_GNUC_UNUSED, virDomainNetDefPtr iface) { - virNetworkPtr net =3D NULL; + g_autoptr(virNetwork) net =3D NULL; virNetworkPortPtr port =3D NULL; int ret =3D -1; =20 @@ -31561,7 +31561,6 @@ virDomainNetReleaseActualDevice(virConnectPtr conn, =20 cleanup: virObjectUnref(port); - virObjectUnref(net); return ret; } =20 @@ -31614,7 +31613,7 @@ int virDomainNetBandwidthUpdate(virDomainNetDefPtr iface, virNetDevBandwidthPtr newBandwidth) { - virNetworkPtr net =3D NULL; + g_autoptr(virNetwork) net =3D NULL; virNetworkPortPtr port =3D NULL; virTypedParameterPtr params =3D NULL; int nparams =3D 0; @@ -31641,7 +31640,6 @@ virDomainNetBandwidthUpdate(virDomainNetDefPtr ifac= e, virObjectUnref(conn); virTypedParamsFree(params, nparams); virObjectUnref(port); - virObjectUnref(net); return ret; } =20 diff --git a/src/conf/network_event.c b/src/conf/network_event.c index 41cabe340a..5a8f138dfd 100644 --- a/src/conf/network_event.c +++ b/src/conf/network_event.c @@ -111,7 +111,7 @@ virNetworkEventDispatchDefaultFunc(virConnectPtr conn, VIR_WARN("Unexpected event ID %d", event->eventID); =20 cleanup: - virObjectUnref(net); + g_object_unref(net); } =20 =20 diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index b2affaacd3..762c9d9159 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1429,9 +1429,10 @@ virNetworkObjListExport(virConnectPtr conn, ret =3D data.nnets; cleanup: virObjectRWUnlock(netobjs); - while (data.nets && data.nnets) - virObjectUnref(data.nets[--data.nnets]); - + while (data.nets && data.nnets) { + if (data.nets[--data.nnets]) + g_object_unref(data.nets[data.nnets]); + } VIR_FREE(data.nets); return ret; } diff --git a/src/datatypes.c b/src/datatypes.c index b9879cfb9e..15130ca0fa 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -37,7 +37,6 @@ virClassPtr virConnectClass; virClassPtr virConnectCloseCallbackDataClass; virClassPtr virDomainClass; virClassPtr virInterfaceClass; -virClassPtr virNetworkClass; virClassPtr virNetworkPortClass; virClassPtr virNodeDeviceClass; virClassPtr virSecretClass; @@ -49,7 +48,6 @@ static void virConnectDispose(void *obj); static void virConnectCloseCallbackDataDispose(void *obj); static void virDomainDispose(void *obj); static void virInterfaceDispose(void *obj); -static void virNetworkDispose(void *obj); static void virNetworkPortDispose(void *obj); static void virNodeDeviceDispose(void *obj); static void virSecretDispose(void *obj); @@ -89,6 +87,22 @@ vir_domain_snapshot_class_init(virDomainSnapshotClass *k= lass) obj->finalize =3D virDomainSnapshotFinalize; } =20 +G_DEFINE_TYPE(virNetwork, vir_network, G_TYPE_OBJECT); +static void virNetworkFinalize(GObject *obj); + +static void +vir_network_init(virNetwork *net G_GNUC_UNUSED) +{ +} + +static void +vir_network_class_init(virNetworkClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->finalize =3D virNetworkFinalize; +} + G_DEFINE_TYPE(virNWFilter, vir_nw_filter, G_TYPE_OBJECT); static void virNWFilterFinalize(GObject *obj); =20 @@ -174,7 +188,6 @@ virDataTypesOnceInit(void) DECLARE_CLASS_LOCKABLE(virConnectCloseCallbackData); DECLARE_CLASS(virDomain); DECLARE_CLASS(virInterface); - DECLARE_CLASS(virNetwork); DECLARE_CLASS(virNetworkPort); DECLARE_CLASS(virNodeDevice); DECLARE_CLASS(virSecret); @@ -411,39 +424,34 @@ virDomainDispose(void *obj) * @uuid: pointer to the uuid * * Allocates a new network object. When the object is no longer needed, - * 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 object, or NULL on error. */ virNetworkPtr virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *u= uid) { - virNetworkPtr ret =3D NULL; + g_autoptr(virNetwork) 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(virNetworkClass))) - goto error; + ret =3D VIR_NETWORK(g_object_new(VIR_TYPE_NETWORK, NULL)); =20 ret->name =3D g_strdup(name); =20 ret->conn =3D virObjectRef(conn); memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); =20 - return ret; - - error: - virObjectUnref(ret); - return NULL; + return g_steal_pointer(&ret); } =20 /** - * virNetworkDispose: + * virNetworkFinalize: * @obj: the network to release * * Unconditionally release all memory associated with a network. @@ -453,9 +461,9 @@ virGetNetwork(virConnectPtr conn, const char *name, con= st unsigned char *uuid) * which may also be released if its ref count hits zero. */ static void -virNetworkDispose(void *obj) +virNetworkFinalize(GObject *obj) { - virNetworkPtr network =3D obj; + virNetworkPtr network =3D VIR_NETWORK(obj); char uuidstr[VIR_UUID_STRING_BUFLEN]; =20 virUUIDFormat(network->uuid, uuidstr); @@ -463,6 +471,8 @@ virNetworkDispose(void *obj) =20 VIR_FREE(network->name); virObjectUnref(network->conn); + + G_OBJECT_CLASS(vir_network_parent_class)->finalize(obj); } =20 =20 @@ -490,7 +500,7 @@ virGetNetworkPort(virNetworkPtr net, const unsigned cha= r *uuid) if (!(ret =3D virObjectNew(virNetworkPortClass))) goto error; =20 - ret->net =3D virObjectRef(net); + ret->net =3D g_object_ref(net); memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); =20 return ret; @@ -519,7 +529,7 @@ virNetworkPortDispose(void *obj) virUUIDFormat(port->uuid, uuidstr); VIR_DEBUG("release network port %p %s", port, uuidstr); =20 - virObjectUnref(port->net); + g_object_unref(port->net); } =20 =20 diff --git a/src/datatypes.h b/src/datatypes.h index 87c6a1366e..e91a6c71f4 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -33,7 +33,6 @@ extern virClassPtr virConnectClass; extern virClassPtr virDomainClass; extern virClassPtr virInterfaceClass; -extern virClassPtr virNetworkClass; extern virClassPtr virNetworkPortClass; extern virClassPtr virNodeDeviceClass; extern virClassPtr virSecretClass; @@ -49,13 +48,6 @@ G_DECLARE_FINAL_TYPE(virDomainCheckpoint, DOMAIN_CHECKPOINT, GObject); =20 -#define VIR_TYPE_NW_FILTER_BINDING vir_nw_filter_binding_get_type() -G_DECLARE_FINAL_TYPE(virNWFilterBinding, - vir_nw_filter_binding, - VIR, - NW_FILTER_BINDING, - GObject); - #define VIR_TYPE_DOMAIN_SNAPSHOT vir_domain_snapshot_get_type() G_DECLARE_FINAL_TYPE(virDomainSnapshot, vir_domain_snapshot, @@ -63,9 +55,19 @@ G_DECLARE_FINAL_TYPE(virDomainSnapshot, DOMAIN_SNAPSHOT, GObject); =20 +#define VIR_TYPE_NETWORK vir_network_get_type() +G_DECLARE_FINAL_TYPE(virNetwork, vir_network, VIR, NETWORK, GObject); + #define VIR_TYPE_NW_FILTER vir_nw_filter_get_type() G_DECLARE_FINAL_TYPE(virNWFilter, vir_nw_filter, VIR, NW_FILTER, GObject); =20 +#define VIR_TYPE_NW_FILTER_BINDING vir_nw_filter_binding_get_type() +G_DECLARE_FINAL_TYPE(virNWFilterBinding, + vir_nw_filter_binding, + VIR, + NW_FILTER_BINDING, + GObject); + extern virClassPtr virAdmConnectClass; =20 #define VIR_TYPE_ADM_SERVER vir_adm_server_get_type() @@ -119,8 +121,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); =20 #define virCheckNetworkReturn(obj, retval) \ do { \ - virNetworkPtr _net =3D (obj); \ - if (!virObjectIsClass(_net, virNetworkClass) || \ + virNetworkPtr _net =3D VIR_NETWORK(obj); \ + if (!G_IS_OBJECT(_net) || !(G_OBJECT_TYPE(_net) =3D=3D VIR_TYPE_NE= TWORK) || \ !virObjectIsClass(_net->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_NETWORK, \ VIR_ERR_INVALID_NETWORK, \ @@ -132,8 +134,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); } while (0) #define virCheckNetworkGoto(obj, label) \ do { \ - virNetworkPtr _net =3D (obj); \ - if (!virObjectIsClass(_net, virNetworkClass) || \ + virNetworkPtr _net =3D VIR_NETWORK(obj); \ + if (!G_IS_OBJECT(_net) || !(G_OBJECT_TYPE(_net) =3D=3D VIR_TYPE_NE= TWORK) || \ !virObjectIsClass(_net->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_NETWORK, \ VIR_ERR_INVALID_NETWORK, \ @@ -147,7 +149,7 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); do { \ virNetworkPortPtr _port =3D (obj); \ if (!virObjectIsClass(_port, virNetworkPortClass) || \ - !virObjectIsClass(_port->net, virNetworkClass)) { \ + !G_IS_OBJECT(_port->net) || !(G_OBJECT_TYPE(_port->net) =3D=3D= VIR_TYPE_NETWORK)) { \ virReportErrorHelper(VIR_FROM_NETWORK, \ VIR_ERR_INVALID_NETWORK_PORT, \ __FILE__, __FUNCTION__, __LINE__, \ @@ -161,7 +163,7 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); do { \ virNetworkPortPtr _port =3D (obj); \ if (!virObjectIsClass(_port, virNetworkPortClass) || \ - !virObjectIsClass(_port->net, virNetworkClass)) { \ + !G_IS_OBJECT(_port->net) || !(G_OBJECT_TYPE(_port->net) =3D=3D= VIR_TYPE_NETWORK)) { \ virReportErrorHelper(VIR_FROM_NETWORK, \ VIR_ERR_INVALID_NETWORK_PORT, \ __FILE__, __FUNCTION__, __LINE__, \ @@ -639,13 +641,12 @@ struct _virDomain { * Internal structure associated to a network */ struct _virNetwork { - virObject parent; + GObject parent; virConnectPtr conn; /* pointer back to the connection= */ char *name; /* the network external name */ unsigned char uuid[VIR_UUID_BUFLEN]; /* the network unique identifier = */ }; =20 -G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetwork, virObjectUnref); =20 =20 /** diff --git a/src/libvirt-network.c b/src/libvirt-network.c index 09e24fb0a8..3847617d4d 100644 --- a/src/libvirt-network.c +++ b/src/libvirt-network.c @@ -654,7 +654,7 @@ virNetworkFree(virNetworkPtr network) =20 virCheckNetworkReturn(network, -1); =20 - virObjectUnref(network); + g_object_unref(network); return 0; } =20 @@ -679,14 +679,13 @@ virNetworkFree(virNetworkPtr network) int virNetworkRef(virNetworkPtr network) { - VIR_DEBUG("network=3D%p refs=3D%d", network, - network ? network->parent.u.s.refs : 0); + VIR_DEBUG("network=3D%p", network); =20 virResetLastError(); =20 virCheckNetworkReturn(network, -1); =20 - virObjectRef(network); + g_object_ref(network); return 0; } =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index aff0688548..8293a5e88d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1365,7 +1365,6 @@ virGetStoragePool; virGetStorageVol; virGetStream; virInterfaceClass; -virNetworkClass; virNetworkPortClass; virNewConnectCloseCallbackData; virNodeDeviceClass; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 21089c33d7..d9377438d9 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1198,7 +1198,7 @@ libxlMakeNic(virDomainDefPtr def, bool attach) { virDomainNetType actual_type =3D virDomainNetGetActualType(l_nic); - virNetworkPtr network =3D NULL; + g_autoptr(virNetwork) network =3D NULL; virConnectPtr conn =3D NULL; const virNetDevBandwidth *actual_bw; const virNetDevVPortProfile *port_profile; @@ -1397,7 +1397,6 @@ libxlMakeNic(virDomainDefPtr def, =20 cleanup: virBufferFreeAndReset(&buf); - virObjectUnref(network); virObjectUnref(conn); =20 return ret; diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 9a385eba0d..94863245fe 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -1717,7 +1717,7 @@ xenFormatNet(virConnectPtr conn, return -1; } bridge =3D virNetworkGetBridgeName(network); - virObjectUnref(network); + g_object_unref(network); if (!bridge) { virReportError(VIR_ERR_INTERNAL_ERROR, _("network %s is not active"), diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index c024211ea5..ee6bbb24d0 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -6075,7 +6075,7 @@ remoteDispatchConnectNetworkEventRegisterAny(virNetSe= rverPtr server G_GNUC_UNUSE remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); - virObjectUnref(net); + g_object_unref(net); return rv; } =20 @@ -6807,7 +6807,7 @@ remoteDispatchNetworkGetDHCPLeases(virNetServerPtr se= rver G_GNUC_UNUSED, for (i =3D 0; i < nleases; i++) virNetworkDHCPLeaseFree(leases[i]); VIR_FREE(leases); - virObjectUnref(net); + g_object_unref(net); return rv; } =20 @@ -7234,7 +7234,7 @@ get_nonnull_network_port(virConnectPtr conn, remote_n= onnull_network_port port) if (!net) return NULL; ret =3D virGetNetworkPort(net, BAD_CAST port.uuid); - virObjectUnref(net); + g_object_unref(net); return ret; } =20 diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 5051c583d7..f19061200c 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5471,7 +5471,7 @@ remoteNetworkBuildEventLifecycle(virNetClientProgramP= tr prog G_GNUC_UNUSED, =20 event =3D virNetworkEventLifecycleNew(net->name, net->uuid, msg->event, msg->detail); - virObjectUnref(net); + g_object_unref(net); =20 virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } @@ -8281,7 +8281,7 @@ get_nonnull_network_port(virConnectPtr conn, remote_n= onnull_network_port port) if (!net) return NULL; ret =3D virGetNetworkPort(net, BAD_CAST port.uuid); - virObjectUnref(net); + g_object_unref(net); return ret; } =20 --=20 2.25.1