From nobody Mon Feb 9 09:57:25 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=1585927043; cv=none; d=zohomail.com; s=zohoarc; b=V+5q+X1Oo7PFRpDH5BuuE9JQYKaV5TSgw1ehkJgQG7gv0mWMj6zpdGeViIZwci6Q0r866jbZ8i+uVUOckPGZyn8uZJF2zYON7tzcNO/PzXXgZq/d2exTucrLaFCm5vM2Addw/uVpcwlrMRzBogzkR30ARfUCayFA2ybHcZgiTpM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585927043; 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=Vk+7afz3xkVCFkAtcz7exY6nVY1c9E4GdU9OuubUInk=; b=jn3eiKsuvhqRFypsG3Uefju0znuiBai3Wm7cFr9tqe9W21OZLY3b0aW75U+nVmjJH1ScjGyyagrX3IfzXJzi+ZxuJFOYk/zBB4I3RC3hTOySw0EobeSabi82O5J78QOEpSiSfoaTldcftJSeepiUmretSim5dcXdGyFZiWZ3ARc= 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 1585927043460781.9362814688332; Fri, 3 Apr 2020 08:17:23 -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-370-Dmx7vomDNYmGzO0hxQ6ugA-1; Fri, 03 Apr 2020 11:17:19 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 76FB6801E66; Fri, 3 Apr 2020 15:17:11 +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 4617E10002CD; Fri, 3 Apr 2020 15:17:11 +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 D9B184E47E; Fri, 3 Apr 2020 15:17:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 033FH41e028394 for ; Fri, 3 Apr 2020 11:17:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 209FA123CD57; Fri, 3 Apr 2020 15:17:04 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1C5B1123CD4F for ; Fri, 3 Apr 2020 15:17:04 +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 F216F80030D for ; Fri, 3 Apr 2020 15:17:03 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-325-JyreekyuMAeU2lc8V8wFyg-1; Fri, 03 Apr 2020 11:16:49 -0400 Received: by mail-wr1-f67.google.com with SMTP id h15so8947006wrx.9 for ; Fri, 03 Apr 2020 08:16:48 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 08:16:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585927042; 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=Vk+7afz3xkVCFkAtcz7exY6nVY1c9E4GdU9OuubUInk=; b=QBN58nwNPW/60KKOJj2KYYsIIL/Ts9cDKFMnxKd6+r8+75stp8+IsDdpA6fKjKmG6btQyf Jp6mEpQolQcaVHJJj0Rnv3NfCja4eMQDGyKSXR7ySyTBXJQRP/7ISy4DUna28cRBdkt/Pz gxbLHaDgW0vOFIKf3Spj/Qk4Knl1K0w= X-MC-Unique: Dmx7vomDNYmGzO0hxQ6ugA-1 X-MC-Unique: JyreekyuMAeU2lc8V8wFyg-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=sjgD3ynoG5Bh10NAtKtPFmk3gAgKY3iYGPekl3t2PdE=; b=Qp+AOCqGC8Qjyd/HvrPYq0JM7+nK1NzIvLXGW1tBXLBNOv+I+t+GsY3Rec1TgmVGqJ pZSVnLzg/7m28KBRysbS6g8BlRjT/S/eoteUmgjAFGUQsf877K6oRTEPT6NaiXN3LjVZ aTqRogBi7Yp90aHRung7b0LPnsMznpLgiub+r8VSRJYQQW+Y1tlZ4Eqw0RK04T/cFrxa 2PRzHOobAJnE1+V3NEMxwBGUb/BKpHAY/0LQAQFlKQ6mxwASFMU63TAC8RzoB1edTI/1 CGvtTed94XToXjk/SfYEcHSe04vbr4Kd7n9WcVX9BURg7PHXpLeB+Hbx95UQeEr3rAxW ajNA== X-Gm-Message-State: AGi0PubxXUEMwi9b11TUZdB0uCHi40531e6pM4k8rVyz5AIiegWLzsLN I9EkfxR5onGNLXBFdlDM9kONuNByeTQ= X-Google-Smtp-Source: APiQypKaTerJ9cwflEJsNONzAvxEi7gzCLUbwIcBoQ/3zqKmY87iYgO41765gILIi/kQnLF3CxloVw== X-Received: by 2002:a05:6000:a:: with SMTP id h10mr10137404wrx.226.1585927007342; Fri, 03 Apr 2020 08:16:47 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH 21/36] datatypes: convert virInterface to GObject Date: Fri, 3 Apr 2020 17:15:49 +0200 Message-Id: <20200403151604.106616-22-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.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 033FH41e028394 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.22 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/virinterfaceobj.c | 7 ++-- src/datatypes.c | 44 +++++++++++++++---------- src/datatypes.h | 10 +++--- src/interface/interface_backend_netcf.c | 2 +- src/interface/interface_backend_udev.c | 2 +- src/libvirt-interface.c | 6 ++-- src/libvirt_private.syms | 1 - 7 files changed, 42 insertions(+), 30 deletions(-) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 43ba395d2b..da6c56862b 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -338,9 +338,10 @@ virInterfaceObjListExport(virConnectPtr conn, ret =3D data.nifaces; cleanup: virObjectRWUnlock(ifaceobjs); - while (data.ifaces && data.nifaces) - virObjectUnref(data.ifaces[--data.nifaces]); - + while (data.ifaces && data.nifaces) { + if (data.ifaces[--data.nifaces]) + g_object_unref(data.ifaces[data.nifaces]); + } VIR_FREE(data.ifaces); return ret; } diff --git a/src/datatypes.c b/src/datatypes.c index e715c37306..f1bcca44f1 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -36,7 +36,6 @@ VIR_LOG_INIT("datatypes"); virClassPtr virConnectClass; virClassPtr virConnectCloseCallbackDataClass; virClassPtr virDomainClass; -virClassPtr virInterfaceClass; virClassPtr virNodeDeviceClass; virClassPtr virSecretClass; virClassPtr virStreamClass; @@ -46,7 +45,6 @@ virClassPtr virStoragePoolClass; static void virConnectDispose(void *obj); static void virConnectCloseCallbackDataDispose(void *obj); static void virDomainDispose(void *obj); -static void virInterfaceDispose(void *obj); static void virNodeDeviceDispose(void *obj); static void virSecretDispose(void *obj); static void virStreamDispose(void *obj); @@ -85,6 +83,22 @@ vir_domain_snapshot_class_init(virDomainSnapshotClass *k= lass) obj->finalize =3D virDomainSnapshotFinalize; } =20 +G_DEFINE_TYPE(virInterface, vir_interface, G_TYPE_OBJECT); +static void virInterfaceFinalize(GObject *obj); + +static void +vir_interface_init(virInterface *iface G_GNUC_UNUSED) +{ +} + +static void +vir_interface_class_init(virInterfaceClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->finalize =3D virInterfaceFinalize; +} + G_DEFINE_TYPE(virNetwork, vir_network, G_TYPE_OBJECT); static void virNetworkFinalize(GObject *obj); =20 @@ -201,7 +215,6 @@ virDataTypesOnceInit(void) DECLARE_CLASS_LOCKABLE(virConnect); DECLARE_CLASS_LOCKABLE(virConnectCloseCallbackData); DECLARE_CLASS(virDomain); - DECLARE_CLASS(virInterface); DECLARE_CLASS(virNodeDevice); DECLARE_CLASS(virSecret); DECLARE_CLASS(virStream); @@ -553,42 +566,37 @@ virNetworkPortFinalize(GObject *obj) * @mac: pointer to the mac * * Allocates a new interface 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 interface object, or NULL on error. */ virInterfacePtr virGetInterface(virConnectPtr conn, const char *name, const char *mac) { - virInterfacePtr ret =3D NULL; + g_autoptr(virInterface) ret =3D NULL; =20 if (virDataTypesInitialize() < 0) return NULL; =20 - virCheckConnectGoto(conn, error); - virCheckNonNullArgGoto(name, error); + virCheckConnectReturn(conn, NULL); + virCheckNonNullArgReturn(name, NULL); =20 /* a NULL mac from caller is okay. Treat it as blank */ if (mac =3D=3D NULL) mac =3D ""; =20 - if (!(ret =3D virObjectNew(virInterfaceClass))) - goto error; + ret =3D VIR_INTERFACE(g_object_new(VIR_TYPE_INTERFACE, NULL)); =20 ret->name =3D g_strdup(name); ret->mac =3D g_strdup(mac); =20 ret->conn =3D virObjectRef(conn); =20 - return ret; - - error: - virObjectUnref(ret); - return NULL; + return g_steal_pointer(&ret); } =20 /** - * virInterfaceDispose: + * virInterfaceFinalize: * @obj: the interface to release * * Unconditionally release all memory associated with an interface. @@ -598,14 +606,16 @@ virGetInterface(virConnectPtr conn, const char *name,= const char *mac) * which may also be released if its ref count hits zero. */ static void -virInterfaceDispose(void *obj) +virInterfaceFinalize(GObject *obj) { - virInterfacePtr iface =3D obj; + virInterfacePtr iface =3D VIR_INTERFACE(obj); VIR_DEBUG("release interface %p %s", iface, iface->name); =20 VIR_FREE(iface->name); VIR_FREE(iface->mac); virObjectUnref(iface->conn); + + G_OBJECT_CLASS(vir_interface_parent_class)->finalize(obj); } =20 =20 diff --git a/src/datatypes.h b/src/datatypes.h index a544a7a347..c68a0e9265 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -32,7 +32,6 @@ =20 extern virClassPtr virConnectClass; extern virClassPtr virDomainClass; -extern virClassPtr virInterfaceClass; extern virClassPtr virNodeDeviceClass; extern virClassPtr virSecretClass; extern virClassPtr virStreamClass; @@ -54,6 +53,9 @@ G_DECLARE_FINAL_TYPE(virDomainSnapshot, DOMAIN_SNAPSHOT, GObject); =20 +#define VIR_TYPE_INTERFACE vir_interface_get_type() +G_DECLARE_FINAL_TYPE(virInterface, vir_interface, VIR, INTERFACE, GObject); + #define VIR_TYPE_NETWORK vir_network_get_type() G_DECLARE_FINAL_TYPE(virNetwork, vir_network, VIR, NETWORK, GObject); =20 @@ -176,8 +178,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); =20 #define virCheckInterfaceReturn(obj, retval) \ do { \ - virInterfacePtr _iface =3D (obj); \ - if (!virObjectIsClass(_iface, virInterfaceClass) || \ + virInterfacePtr _iface =3D VIR_INTERFACE(obj); \ + if (!G_IS_OBJECT(_iface) || !(G_OBJECT_TYPE(_iface) =3D=3D VIR_TYP= E_INTERFACE) || \ !virObjectIsClass(_iface->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_INTERFACE, \ VIR_ERR_INVALID_INTERFACE, \ @@ -670,7 +672,7 @@ struct _virNetworkPort { * Internal structure associated to a physical host interface */ struct _virInterface { - virObject parent; + GObject parent; virConnectPtr conn; /* pointer back to the connection= */ char *name; /* the network external name */ char *mac; /* the interface MAC address */ diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interf= ace_backend_netcf.c index dd0c1481d9..dbf21088fd 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -740,7 +740,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn, =20 if (tmp_iface_objs) { for (i =3D 0; i < niface_objs; i++) - virObjectUnref(tmp_iface_objs[i]); + g_object_unref(tmp_iface_objs[i]); VIR_FREE(tmp_iface_objs); } =20 diff --git a/src/interface/interface_backend_udev.c b/src/interface/interfa= ce_backend_udev.c index e388f98536..6fc9ca840e 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -421,7 +421,7 @@ udevConnectListAllInterfaces(virConnectPtr conn, =20 if (ifaces) { for (tmp_count =3D 0; tmp_count < count; tmp_count++) - virObjectUnref(ifaces_list[tmp_count]); + g_object_unref(ifaces_list[tmp_count]); } =20 VIR_FREE(ifaces_list); diff --git a/src/libvirt-interface.c b/src/libvirt-interface.c index 2d2df68131..0fd0ce7154 100644 --- a/src/libvirt-interface.c +++ b/src/libvirt-interface.c @@ -642,13 +642,13 @@ virInterfaceDestroy(virInterfacePtr iface, unsigned i= nt flags) int virInterfaceRef(virInterfacePtr iface) { - VIR_DEBUG("iface=3D%p refs=3D%d", iface, iface ? iface->parent.u.s.ref= s : 0); + VIR_DEBUG("iface=3D%p", iface); =20 virResetLastError(); =20 virCheckInterfaceReturn(iface, -1); =20 - virObjectRef(iface); + g_object_ref(iface); return 0; } =20 @@ -671,7 +671,7 @@ virInterfaceFree(virInterfacePtr iface) =20 virCheckInterfaceReturn(iface, -1); =20 - virObjectUnref(iface); + g_object_unref(iface); return 0; } =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9530b7a254..a5e4b00a0e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1364,7 +1364,6 @@ virGetSecret; virGetStoragePool; virGetStorageVol; virGetStream; -virInterfaceClass; virNewConnectCloseCallbackData; virNodeDeviceClass; virSecretClass; --=20 2.25.1