From nobody Mon Feb 9 12:25:09 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=1589371131; cv=none; d=zohomail.com; s=zohoarc; b=kNrULnNsZi72zBnDKvuTkKZ5n8oajSSISoPUgQs1ltYnrzTJdziUZnfJmawM2HvvU0VnoxQSJ6nqKnTp9FNOtkDHm/FsaHr1+iT/rJofympZZ9aV79dAaRLNXSyjugGzzQDZjCKmtrPmHlSbd7dxk+jz7IpwtkS/W4WHH9gVUII= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589371131; 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=5mIAGiX5lQK2Lhr8yh+JuU4o9QvzVovXre2hS9zLY9c=; b=P3fgMLXg67xu9BhPYjg/Laq3lZFupow9DfOKyON9U/p6QYKTDavVsgkWyxV/e8CLRvamELAWgEhuWF4I1Qu9XSBZ4aoUVvWEh1GM6KPO+fXqvZUG3XturT7n3IC5fvEt+srPDDb4xm4FzDNAz/pn6nq85SI3DRtjQhvCQ7FuO6o= 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 1589371131876635.3421922543449; Wed, 13 May 2020 04:58:51 -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-62-6eJBIiAxO6itiewVv-72Ug-1; Wed, 13 May 2020 07:58:47 -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 1D3EF80572C; Wed, 13 May 2020 11:58:42 +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 EA78D6E709; Wed, 13 May 2020 11:58:41 +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 BDBC34E9B6; Wed, 13 May 2020 11:58:41 +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 04DBwefX016175 for ; Wed, 13 May 2020 07:58:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0DA5E20110C7; Wed, 13 May 2020 11:58:40 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 085A9202696C for ; Wed, 13 May 2020 11:58:40 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (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 DDA3180CDAE for ; Wed, 13 May 2020 11:58:39 +0000 (UTC) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-478-NlmoxwwCOeqbDDJPqxNweQ-1; Wed, 13 May 2020 07:58:37 -0400 Received: by mail-wm1-f66.google.com with SMTP id g14so11684597wme.1 for ; Wed, 13 May 2020 04:58:37 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2020 04:58:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589371130; 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=5mIAGiX5lQK2Lhr8yh+JuU4o9QvzVovXre2hS9zLY9c=; b=Q9ggc+ktrKlb/9AVKhu7Ffv2cXJN9LJ8G/X6ost5H2oQBRFqE1N6ZuvjY6UloIEUT86nR3 ivLuUUZIaK50qwm8RrN5xbImuDsdv8GuMsEKxJ7c3RV/KitSoQzJlq+LA0Bqa5AzITL+5U KIkCOcgSPVJu2BaxbzYs3P2t/XDumwc= X-MC-Unique: 6eJBIiAxO6itiewVv-72Ug-1 X-MC-Unique: NlmoxwwCOeqbDDJPqxNweQ-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=5mIAGiX5lQK2Lhr8yh+JuU4o9QvzVovXre2hS9zLY9c=; b=OqKAucVrEBCifKnc1kqeFgKZDwWrMeZUDSzsLgf7LhW3b5bDwsiR12xk/ndvbMjefV gW1y2d3nwSZbAcTbMw000MG61m8XRP4GRi4VKbGVv43zdfQD+8YY6XkTd9XGOlmYaM28 QeYTkJ5xAuzsvuO1x718SNRMJG/h2qErKrbKt72U/lsR04OgfI6NZPoJHNKGjB2o8j8/ ef7yusKlFCcoqxNYxuWFAGZmzCNHtXeH9k6iPIC7Ih4BBJnolB0HvkzctX7E8r+JD5H9 7u5bkxLVEZreFdBYlIQnBW5meNGO9o86RdcW1yKkWM+gftzii5vqf2musqbAGSIqllon cM5Q== X-Gm-Message-State: AOAM532x+qYH1BPTCRZJUee/AbJkIwpKBypRWI9/xlHJP5f+pF90OXsX lUYHvHnJvs7oOi8XnqB2LvHMuLsF X-Google-Smtp-Source: ABdhPJxqcU2wg5XQ9L3N1d9cir6vN2hP6YHwXFNbnGYHXAIrF9sQRIM+b/r5bfpYfWLT3ByUVta0rg== X-Received: by 2002:a1c:9d50:: with SMTP id g77mr8693234wme.56.1589371115561; Wed, 13 May 2020 04:58:35 -0700 (PDT) From: Rafael Fonseca To: libvirt-list@redhat.com Subject: [PATCH 21/40] datatypes: convert virNetwork to GObject Date: Wed, 13 May 2020 13:57:05 +0200 Message-Id: <20200513115724.157687-22-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.78 on 10.11.54.4 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/network_event.c | 7 ++-- src/conf/virnetworkobj.c | 5 +-- src/datatypes.c | 50 +++++++++++++++++------------ src/datatypes.h | 19 +++++------ src/libvirt-network.c | 7 ++-- src/libvirt_private.syms | 2 +- src/libxl/libxl_conf.c | 3 +- src/libxl/xen_common.c | 3 +- src/remote/remote_daemon_dispatch.c | 11 +++---- src/remote/remote_driver.c | 8 ++--- src/rpc/gendispatch.pl | 1 + 12 files changed, 59 insertions(+), 63 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 15d371df6e..5f677d5bb3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -31882,7 +31882,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 @@ -31903,7 +31903,6 @@ virDomainNetReleaseActualDevice(virConnectPtr conn, =20 cleanup: virObjectUnref(port); - virObjectUnref(net); return ret; } =20 @@ -31956,7 +31955,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; @@ -31983,7 +31982,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..f96f19c5ef 100644 --- a/src/conf/network_event.c +++ b/src/conf/network_event.c @@ -88,7 +88,7 @@ virNetworkEventDispatchDefaultFunc(virConnectPtr conn, virConnectObjectEventGenericCallback cb, void *cbopaque) { - virNetworkPtr net =3D virGetNetwork(conn, event->meta.name, event->met= a.uuid); + g_autoptr(virNetwork) net =3D virGetNetwork(conn, event->meta.name, ev= ent->meta.uuid); if (!net) return; =20 @@ -102,16 +102,13 @@ virNetworkEventDispatchDefaultFunc(virConnectPtr conn, networkLifecycle= Event->type, networkLifecycle= Event->detail, cbopaque); - goto cleanup; + return; } =20 case VIR_NETWORK_EVENT_ID_LAST: break; } VIR_WARN("Unexpected event ID %d", event->eventID); - - cleanup: - virObjectUnref(net); } =20 =20 diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index b2affaacd3..2d375deb47 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1429,10 +1429,7 @@ virNetworkObjListExport(virConnectPtr conn, ret =3D data.nnets; cleanup: virObjectRWUnlock(netobjs); - while (data.nets && data.nnets) - virObjectUnref(data.nets[--data.nnets]); - - VIR_FREE(data.nets); + virGObjectListFreeCount(data.nets, data.nnets); return ret; } =20 diff --git a/src/datatypes.c b/src/datatypes.c index d95e7e5fcc..3889ece17e 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 5f0ab5c84b..706cec340f 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; @@ -55,6 +54,9 @@ 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 @@ -118,8 +120,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 (_net =3D=3D NULL || \ !virObjectIsClass(_net->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_NETWORK, \ VIR_ERR_INVALID_NETWORK, \ @@ -131,8 +133,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 (_net =3D=3D NULL || \ !virObjectIsClass(_net->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_NETWORK, \ VIR_ERR_INVALID_NETWORK, \ @@ -146,7 +148,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)) { \ + !VIR_IS_NETWORK(_port->net)) { \ virReportErrorHelper(VIR_FROM_NETWORK, \ VIR_ERR_INVALID_NETWORK_PORT, \ __FILE__, __FUNCTION__, __LINE__, \ @@ -160,7 +162,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)) { \ + !VIR_IS_NETWORK(_port->net)) { \ virReportErrorHelper(VIR_FROM_NETWORK, \ VIR_ERR_INVALID_NETWORK_PORT, \ __FILE__, __FUNCTION__, __LINE__, \ @@ -638,13 +640,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 e93d005bba..a7255d6f18 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1358,6 +1358,7 @@ virCPUx86FeatureFilterSelectMSR; # datatypes.h vir_domain_checkpoint_get_type; vir_domain_snapshot_get_type; +vir_network_get_type; vir_nw_filter_binding_get_type; vir_nw_filter_get_type; virConnectClass; @@ -1382,7 +1383,6 @@ virGetStoragePool; virGetStorageVol; virGetStream; virInterfaceClass; -virNetworkClass; virNetworkPortClass; virNewConnectCloseCallbackData; virNodeDeviceClass; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index a41f22386f..2a719486fa 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1236,7 +1236,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; @@ -1435,7 +1435,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 5c37e431eb..631c9fe8d5 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -1750,7 +1750,7 @@ xenFormatNet(virConnectPtr conn, =20 case VIR_DOMAIN_NET_TYPE_NETWORK: { - virNetworkPtr network =3D virNetworkLookupByName(conn, net->data.n= etwork.name); + g_autoptr(virNetwork) network =3D virNetworkLookupByName(conn, net= ->data.network.name); char *bridge; if (!network) { virReportError(VIR_ERR_NO_NETWORK, "%s", @@ -1758,7 +1758,6 @@ xenFormatNet(virConnectPtr conn, return -1; } bridge =3D virNetworkGetBridgeName(network); - virObjectUnref(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 3b016636e0..4add62bb86 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -6014,7 +6014,7 @@ remoteDispatchConnectNetworkEventRegisterAny(virNetSe= rverPtr server G_GNUC_UNUSE int rv =3D -1; daemonClientEventCallbackPtr callback =3D NULL; daemonClientEventCallbackPtr ref; - virNetworkPtr net =3D NULL; + g_autoptr(virNetwork) net =3D NULL; struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(client); virConnectPtr conn =3D remoteGetNetworkConn(client); @@ -6074,7 +6074,6 @@ remoteDispatchConnectNetworkEventRegisterAny(virNetSe= rverPtr server G_GNUC_UNUSE remoteEventCallbackFree(callback); if (rv < 0) virNetMessageSaveError(rerr); - virObjectUnref(net); return rv; } =20 @@ -6756,7 +6755,7 @@ remoteDispatchNetworkGetDHCPLeases(virNetServerPtr se= rver G_GNUC_UNUSED, int rv =3D -1; size_t i; virNetworkDHCPLeasePtr *leases =3D NULL; - virNetworkPtr net =3D NULL; + g_autoptr(virNetwork) net =3D NULL; int nleases =3D 0; virConnectPtr conn =3D remoteGetNetworkConn(client); =20 @@ -6806,7 +6805,6 @@ remoteDispatchNetworkGetDHCPLeases(virNetServerPtr se= rver G_GNUC_UNUSED, for (i =3D 0; i < nleases; i++) virNetworkDHCPLeaseFree(leases[i]); VIR_FREE(leases); - virObjectUnref(net); return rv; } =20 @@ -7228,12 +7226,11 @@ static virNetworkPortPtr get_nonnull_network_port(virConnectPtr conn, remote_nonnull_network_port p= ort) { virNetworkPortPtr ret; - virNetworkPtr net; - net =3D virGetNetwork(conn, port.net.name, BAD_CAST port.net.uuid); + 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); - virObjectUnref(net); return ret; } =20 diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 961f8f78d9..283a0e9c12 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5456,7 +5456,7 @@ remoteNetworkBuildEventLifecycle(virNetClientProgramP= tr prog G_GNUC_UNUSED, virConnectPtr conn =3D opaque; struct private_data *priv =3D conn->privateData; remote_network_event_lifecycle_msg *msg =3D evdata; - virNetworkPtr net; + g_autoptr(virNetwork) net =3D NULL; virObjectEventPtr event =3D NULL; =20 net =3D get_nonnull_network(conn, msg->net); @@ -5465,7 +5465,6 @@ remoteNetworkBuildEventLifecycle(virNetClientProgramP= tr prog G_GNUC_UNUSED, =20 event =3D virNetworkEventLifecycleNew(net->name, net->uuid, msg->event, msg->detail); - virObjectUnref(net); =20 virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } @@ -8270,12 +8269,11 @@ static virNetworkPortPtr get_nonnull_network_port(virConnectPtr conn, remote_nonnull_network_port p= ort) { virNetworkPortPtr ret; - virNetworkPtr net; - net =3D virGetNetwork(conn, port.net.name, BAD_CAST port.net.uuid); + 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); - virObjectUnref(net); return ret; } =20 diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 553ede5024..2c101fab6d 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, + virNetwork =3D> 1, virNWFilter =3D> 1, virNWFilterBinding =3D> 1, ); --=20 2.26.2