From nobody Fri Dec 19 21:49:39 2025 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=1587477069; cv=none; d=zohomail.com; s=zohoarc; b=YZ30scw0JmOMuqFmc46Z+bgtk/rVlRWk48waZzXzJIBViLhBw6XoP//GvYfOBPDm/kBQB47DknDephKQJtFKYczXZymStyuHaFCkEiQ6ia9mleKHmqE4DhFcZMfmww1/MCiaIj4Z3EUPcxg8s6t6z0zfaQEG7w3se17s/KI234M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587477069; 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=2+1z+UkffQqSQ8RdacCVTf1dvRS86E15gHAUutrkJ0o=; b=Z1aJejUNHaVxSxa4gGCaHvzDwbGYxPSTKSbI5naSA882q5CQBUa0eUzYrqIsWEpdhSi+vWME75mba1LgCdom1hT7/RUs24a92zlCpc4YPSSjjB+5fk0N3icNLqJG+jW5MQ3YoAeNnjI+61bxZobOu53d+yQsaOFT4/fwmHa2nXE= 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 1587477069711927.1959074661029; Tue, 21 Apr 2020 06:51:09 -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-402-NW1ZTuDfP4mvOZyaf60pKA-1; Tue, 21 Apr 2020 09:51:04 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EDB4B8024CE; Tue, 21 Apr 2020 13:50:58 +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 C669A76E8E; Tue, 21 Apr 2020 13:50:58 +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 7ECDD941CF; Tue, 21 Apr 2020 13:50:58 +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 03LDofLN003498 for ; Tue, 21 Apr 2020 09:50:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id C841B202A943; Tue, 21 Apr 2020 13:50:41 +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 C3E4B2024517 for ; Tue, 21 Apr 2020 13:50:41 +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 A52D386BCC7 for ; Tue, 21 Apr 2020 13:50:41 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-2-C26TWD-oPei_HHyi8GvwGw-1; Tue, 21 Apr 2020 09:50:38 -0400 Received: by mail-wm1-f50.google.com with SMTP id g12so3762734wmh.3 for ; Tue, 21 Apr 2020 06:50:37 -0700 (PDT) Received: from localhost.localdomain (public-gprs377075.centertel.pl. [37.47.104.52]) by smtp.gmail.com with ESMTPSA id q10sm3981826wrv.95.2020.04.21.06.50.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 06:50:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587477068; 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=2+1z+UkffQqSQ8RdacCVTf1dvRS86E15gHAUutrkJ0o=; b=WNttR9KWwk67DQ8zW6Uxl4U1GZ0v1Xv8GTtehjCMRIPLNtwpzCugq4EJHLVUmZ/dIVQhAw X7ng04LaRtR0dF7GxmIbnKJfvw0Rp7fusrtqROswXqMOSNpIK0o01p640t7Nh8g2Lqq2gt Ol/iDSwfObOv/H2iK9620YVRpE1a/Q4= X-MC-Unique: NW1ZTuDfP4mvOZyaf60pKA-1 X-MC-Unique: C26TWD-oPei_HHyi8GvwGw-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=mM4ji+t7JYPu7NDJetb1bEbCxYVUtFVFNmqSh6hyYq8=; b=GSqFgWiSwPkDincf4/5P7nIzTG67Tc4znEOQC9Zvti8ZfxSN3ndqeCwAo/OWU4xQOH TfcQaQVZCOKhrlX6f/2O8INm+I0vPHQgTqEf/nfdY87qFNr8Kv9txO/8Cjj7v+kW/He+ +fOQLK9XW3fZ7rQCuxUf4aCRuoaBCX/dWlOP/unmHwdSuxLzb7MJN9QuhFIPm+KK8MMc /rBvzNUnbyOJM93nAmvXj7eZ/KXZLPH24wRUBQQhJ+hL4lUWv1hYVBkCroJkdYz7Z+g/ /iqRunIjn0JgoffBjCagFvPV7fHCtQaIR0fYRVhoKl4NC8lGcYCtwrSpct/enPdtHxtE 2/jg== X-Gm-Message-State: AGi0Pua4HiyzhmYeEm3t5jeLnYTbKWY0ZbxWtVACwetRHAkQKtwaLiPe SNYpBWWdSvqtqNOZeoV6eCipT4tXBgk= X-Google-Smtp-Source: APiQypLZDrIQe//0rU2DrBbtTWo32t1xl7nT0mbcjmIVax878BrRMaosz5duMznaxZAcgdpqcPPTWQ== X-Received: by 2002:a05:600c:4096:: with SMTP id k22mr4608523wmh.99.1587477036191; Tue, 21 Apr 2020 06:50:36 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH v2 26/40] datatypes: convert virNodeDevice to GObject Date: Tue, 21 Apr 2020 15:49:07 +0200 Message-Id: <20200421134921.3717019-27-r4f4rfs@gmail.com> In-Reply-To: <20200421134921.3717019-1-r4f4rfs@gmail.com> References: <20200421134921.3717019-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 03LDofLN003498 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.11 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/node_device_event.c | 11 +++--- src/conf/node_device_util.c | 4 +-- src/conf/virnodedeviceobj.c | 3 +- src/datatypes.c | 67 +++++++++++++++++++++++++----------- src/datatypes.h | 14 ++++---- src/libvirt-nodedev.c | 6 ++-- src/libvirt_private.syms | 2 +- src/libxl/libxl_driver.c | 9 ++--- src/qemu/qemu_driver.c | 9 ++--- src/remote/remote_driver.c | 6 ++-- src/rpc/gendispatch.pl | 5 ++- src/test/test_driver.c | 4 +-- 12 files changed, 77 insertions(+), 63 deletions(-) diff --git a/src/conf/node_device_event.c b/src/conf/node_device_event.c index c6915be593..e4037f5ae0 100644 --- a/src/conf/node_device_event.c +++ b/src/conf/node_device_event.c @@ -110,8 +110,8 @@ virNodeDeviceEventDispatchDefaultFunc(virConnectPtr con= n, virConnectObjectEventGenericCallback= cb, void *cbopaque) { - virNodeDevicePtr dev =3D virGetNodeDevice(conn, - event->meta.name); + g_autoptr(virNodeDevice) dev =3D virGetNodeDevice(conn, + event->meta.name); =20 if (!dev) return; @@ -126,23 +126,20 @@ virNodeDeviceEventDispatchDefaultFunc(virConnectPtr c= onn, nodeDeviceLif= ecycleEvent->type, nodeDeviceLif= ecycleEvent->detail, cbopaque); - goto cleanup; + return; } =20 case VIR_NODE_DEVICE_EVENT_ID_UPDATE: { ((virConnectNodeDeviceEventGenericCallback)cb)(conn, dev, cbopaque); - goto cleanup; + return; } =20 case VIR_NODE_DEVICE_EVENT_ID_LAST: break; } VIR_WARN("Unexpected event ID %d", event->eventID); - - cleanup: - virObjectUnref(dev); } =20 =20 diff --git a/src/conf/node_device_util.c b/src/conf/node_device_util.c index 5e80422d7f..0b9292ffd3 100644 --- a/src/conf/node_device_util.c +++ b/src/conf/node_device_util.c @@ -20,6 +20,7 @@ =20 #include "internal.h" =20 +#include "datatypes.h" #include "node_device_util.h" #include "virlog.h" #include "virscsihost.h" @@ -45,7 +46,7 @@ char * virNodeDeviceGetParentName(virConnectPtr conn, const char *nodedev_name) { - virNodeDevicePtr device =3D NULL; + g_autoptr(virNodeDevice) device =3D NULL; char *parent; =20 if (!(device =3D virNodeDeviceLookupByName(conn, nodedev_name))) { @@ -56,7 +57,6 @@ virNodeDeviceGetParentName(virConnectPtr conn, } =20 parent =3D g_strdup(virNodeDeviceGetParent(device)); - virObjectUnref(device); =20 return parent; } diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 3a34a324ca..9b1133f96b 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -866,7 +866,6 @@ virNodeDeviceObjListExportCallback(void *payload, virNodeDeviceObjMatch(obj, data->flags)) { if (data->devices) { if (!(device =3D virGetNodeDevice(data->conn, def->name))) { - virObjectUnref(device); data->error =3D true; goto cleanup; } @@ -914,7 +913,7 @@ virNodeDeviceObjListExport(virConnectPtr conn, return data.ndevices; =20 cleanup: - virObjectListFree(data.devices); + virGObjectListFreeCount(data.devices, data.ndevices); return -1; } =20 diff --git a/src/datatypes.c b/src/datatypes.c index 66d4f478ab..f324a19ada 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -36,14 +36,12 @@ VIR_LOG_INIT("datatypes"); virClassPtr virConnectClass; virClassPtr virConnectCloseCallbackDataClass; virClassPtr virDomainClass; -virClassPtr virNodeDeviceClass; virClassPtr virSecretClass; virClassPtr virStreamClass; =20 static void virConnectDispose(void *obj); static void virConnectCloseCallbackDataDispose(void *obj); static void virDomainDispose(void *obj); -static void virNodeDeviceDispose(void *obj); static void virSecretDispose(void *obj); static void virStreamDispose(void *obj); =20 @@ -137,6 +135,24 @@ vir_network_port_class_init(virNetworkPortClass *klass) obj->finalize =3D virNetworkPortFinalize; } =20 +G_DEFINE_TYPE(virNodeDevice, vir_node_device, G_TYPE_OBJECT); +static void virNodeDeviceDispose(GObject *obj); +static void virNodeDeviceFinalize(GObject *obj); + +static void +vir_node_device_init(virNodeDevice *dev G_GNUC_UNUSED) +{ +} + +static void +vir_node_device_class_init(virNodeDeviceClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->dispose =3D virNodeDeviceDispose; + obj->finalize =3D virNodeDeviceFinalize; +} + G_DEFINE_TYPE(virNWFilter, vir_nw_filter, G_TYPE_OBJECT); static void virNWFilterDispose(GObject *obj); static void virNWFilterFinalize(GObject *obj); @@ -263,7 +279,6 @@ virDataTypesOnceInit(void) DECLARE_CLASS_LOCKABLE(virConnect); DECLARE_CLASS_LOCKABLE(virConnectCloseCallbackData); DECLARE_CLASS(virDomain); - DECLARE_CLASS(virNodeDevice); DECLARE_CLASS(virSecret); DECLARE_CLASS(virStream); =20 @@ -879,32 +894,27 @@ virStorageVolFinalize(GObject *obj) * @name: device name (unique on node) * * Allocates a new node device 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 node device object, or NULL on error. */ virNodeDevicePtr virGetNodeDevice(virConnectPtr conn, const char *name) { - virNodeDevicePtr ret =3D NULL; + g_autoptr(virNodeDevice) ret =3D NULL; =20 if (virDataTypesInitialize() < 0) return NULL; =20 - virCheckConnectGoto(conn, error); - virCheckNonNullArgGoto(name, error); + virCheckConnectReturn(conn, NULL); + virCheckNonNullArgReturn(name, NULL); =20 - if (!(ret =3D virObjectNew(virNodeDeviceClass))) - goto error; + ret =3D VIR_NODE_DEVICE(g_object_new(VIR_TYPE_NODE_DEVICE, NULL)); =20 ret->name =3D g_strdup(name); =20 ret->conn =3D virObjectRef(conn); - return ret; - - error: - virObjectUnref(ret); - return NULL; + return g_steal_pointer(&ret); } =20 =20 @@ -912,22 +922,37 @@ virGetNodeDevice(virConnectPtr conn, const char *name) * virNodeDeviceDispose: * @obj: the node device to release * - * Unconditionally release all memory associated with a device. - * The device object must not be used once this method returns. + * Unreferences the associated connection object, which may also be + * released if its ref count hits zero. + */ +static void +virNodeDeviceDispose(GObject *obj) +{ + virNodeDevicePtr dev =3D VIR_NODE_DEVICE(obj); + + virObjectUnref(dev->conn); + dev->conn =3D NULL; + + G_OBJECT_CLASS(vir_node_device_parent_class)->dispose(obj); +} + +/** + * virNodeDeviceFinalize: + * @obj: the node device to release * - * It will also unreference the associated connection object, - * which may also be released if its ref count hits zero. + * Unconditionally releases all memory associated with a device. + * The device object must not be used once this method returns. */ static void -virNodeDeviceDispose(void *obj) +virNodeDeviceFinalize(GObject *obj) { - virNodeDevicePtr dev =3D obj; + virNodeDevicePtr dev =3D VIR_NODE_DEVICE(obj); VIR_DEBUG("release dev %p %s", dev, dev->name); =20 VIR_FREE(dev->name); VIR_FREE(dev->parentName); =20 - virObjectUnref(dev->conn); + G_OBJECT_CLASS(vir_node_device_parent_class)->finalize(obj); } =20 =20 diff --git a/src/datatypes.h b/src/datatypes.h index 5492c2ac8a..cbf565097f 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -32,7 +32,6 @@ =20 extern virClassPtr virConnectClass; extern virClassPtr virDomainClass; -extern virClassPtr virNodeDeviceClass; extern virClassPtr virSecretClass; extern virClassPtr virStreamClass; =20 @@ -59,6 +58,9 @@ G_DECLARE_FINAL_TYPE(virNetwork, vir_network, VIR, NETWOR= K, GObject); #define VIR_TYPE_NETWORK_PORT vir_network_port_get_type() G_DECLARE_FINAL_TYPE(virNetworkPort, vir_network_port, VIR, NETWORK_PORT, = GObject); =20 +#define VIR_TYPE_NODE_DEVICE vir_node_device_get_type() +G_DECLARE_FINAL_TYPE(virNodeDevice, vir_node_device, VIR, NODE_DEVICE, GOb= ject); + #define VIR_TYPE_NW_FILTER vir_nw_filter_get_type() G_DECLARE_FINAL_TYPE(virNWFilter, vir_nw_filter, VIR, NW_FILTER, GObject); =20 @@ -248,8 +250,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); =20 #define virCheckNodeDeviceReturn(obj, retval) \ do { \ - virNodeDevicePtr _node =3D (obj); \ - if (!virObjectIsClass(_node, virNodeDeviceClass) || \ + virNodeDevicePtr _node =3D VIR_NODE_DEVICE(obj); \ + if (_node =3D=3D NULL || \ !virObjectIsClass(_node->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_NODEDEV, \ VIR_ERR_INVALID_NODE_DEVICE, \ @@ -262,8 +264,8 @@ G_DECLARE_FINAL_TYPE(virAdmClient, vir_adm_client, VIR,= ADM_CLIENT, GObject); =20 #define virCheckNodeDeviceGoto(obj, label) \ do { \ - virNodeDevicePtr _dev=3D (obj); \ - if (!virObjectIsClass(_dev, virNodeDeviceClass) || \ + virNodeDevicePtr _dev=3D VIR_NODE_DEVICE(obj); \ + if (_dev =3D=3D NULL || \ !virObjectIsClass(_dev->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_NODEDEV, \ VIR_ERR_INVALID_NODE_DEVICE, \ @@ -730,7 +732,7 @@ struct _virStorageVol { * Internal structure associated with a node device */ struct _virNodeDevice { - virObject parent; + GObject parent; virConnectPtr conn; /* pointer back to the connection = */ char *name; /* device name (unique on node) */ char *parentName; /* parent device name */ diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index dce46b7181..98db5e9813 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -452,7 +452,7 @@ virNodeDeviceFree(virNodeDevicePtr dev) =20 virCheckNodeDeviceReturn(dev, -1); =20 - virObjectUnref(dev); + g_object_unref(dev); return 0; } =20 @@ -477,13 +477,13 @@ virNodeDeviceFree(virNodeDevicePtr dev) int virNodeDeviceRef(virNodeDevicePtr dev) { - VIR_DEBUG("dev=3D%p refs=3D%d", dev, dev ? dev->parent.u.s.refs : 0); + VIR_DEBUG("dev=3D%p", dev); =20 virResetLastError(); =20 virCheckNodeDeviceReturn(dev, -1); =20 - virObjectRef(dev); + g_object_ref(dev); return 0; } =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9e559ad1f8..2112082277 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1351,6 +1351,7 @@ vir_domain_snapshot_get_type; vir_interface_get_type; vir_network_get_type; vir_network_port_get_type; +vir_node_device_get_type; vir_nw_filter_binding_get_type; vir_nw_filter_get_type; vir_storage_pool_get_type; @@ -1377,7 +1378,6 @@ virGetStoragePool; virGetStorageVol; virGetStream; virNewConnectCloseCallbackData; -virNodeDeviceClass; virSecretClass; virStreamClass; =20 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 0fce6225d8..0e4d6c56fc 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5787,7 +5787,7 @@ libxlNodeDeviceDetachFlags(virNodeDevicePtr dev, libxlDriverPrivatePtr driver =3D dev->conn->privateData; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; virConnectPtr nodeconn =3D NULL; - virNodeDevicePtr nodedev =3D NULL; + g_autoptr(virNodeDevice) nodedev =3D NULL; =20 virCheckFlags(0, -1); =20 @@ -5837,7 +5837,6 @@ libxlNodeDeviceDetachFlags(virNodeDevicePtr dev, cleanup: virPCIDeviceFree(pci); virNodeDeviceDefFree(def); - virObjectUnref(nodedev); virObjectUnref(nodeconn); VIR_FREE(xml); return ret; @@ -5860,7 +5859,7 @@ libxlNodeDeviceReAttach(virNodeDevicePtr dev) libxlDriverPrivatePtr driver =3D dev->conn->privateData; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; virConnectPtr nodeconn =3D NULL; - virNodeDevicePtr nodedev =3D NULL; + g_autoptr(virNodeDevice) nodedev =3D NULL; =20 if (!(nodeconn =3D virGetConnectNodeDev())) goto cleanup; @@ -5901,7 +5900,6 @@ libxlNodeDeviceReAttach(virNodeDevicePtr dev) cleanup: virPCIDeviceFree(pci); virNodeDeviceDefFree(def); - virObjectUnref(nodedev); virObjectUnref(nodeconn); VIR_FREE(xml); return ret; @@ -5918,7 +5916,7 @@ libxlNodeDeviceReset(virNodeDevicePtr dev) libxlDriverPrivatePtr driver =3D dev->conn->privateData; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; virConnectPtr nodeconn =3D NULL; - virNodeDevicePtr nodedev =3D NULL; + g_autoptr(virNodeDevice) nodedev =3D NULL; =20 if (!(nodeconn =3D virGetConnectNodeDev())) goto cleanup; @@ -5959,7 +5957,6 @@ libxlNodeDeviceReset(virNodeDevicePtr dev) cleanup: virPCIDeviceFree(pci); virNodeDeviceDefFree(def); - virObjectUnref(nodedev); virObjectUnref(nodeconn); VIR_FREE(xml); return ret; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 46851d063e..b35cca4dcc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12957,7 +12957,7 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, bool vfio =3D qemuHostdevHostSupportsPassthroughVFIO(); virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; virConnectPtr nodeconn =3D NULL; - virNodeDevicePtr nodedev =3D NULL; + g_autoptr(virNodeDevice) nodedev =3D NULL; =20 virCheckFlags(0, -1); =20 @@ -13018,7 +13018,6 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, cleanup: virPCIDeviceFree(pci); virNodeDeviceDefFree(def); - virObjectUnref(nodedev); virObjectUnref(nodeconn); return ret; } @@ -13040,7 +13039,7 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) g_autofree char *xml =3D NULL; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; virConnectPtr nodeconn =3D NULL; - virNodeDevicePtr nodedev =3D NULL; + g_autoptr(virNodeDevice) nodedev =3D NULL; =20 if (!(nodeconn =3D virGetConnectNodeDev())) goto cleanup; @@ -13078,7 +13077,6 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) virPCIDeviceFree(pci); cleanup: virNodeDeviceDefFree(def); - virObjectUnref(nodedev); virObjectUnref(nodeconn); return ret; } @@ -13094,7 +13092,7 @@ qemuNodeDeviceReset(virNodeDevicePtr dev) g_autofree char *xml =3D NULL; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; virConnectPtr nodeconn =3D NULL; - virNodeDevicePtr nodedev =3D NULL; + g_autoptr(virNodeDevice) nodedev =3D NULL; =20 if (!(nodeconn =3D virGetConnectNodeDev())) goto cleanup; @@ -13132,7 +13130,6 @@ qemuNodeDeviceReset(virNodeDevicePtr dev) virPCIDeviceFree(pci); cleanup: virNodeDeviceDefFree(def); - virObjectUnref(nodedev); virObjectUnref(nodeconn); return ret; } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 745033befb..0d7f352ae0 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5518,7 +5518,7 @@ remoteNodeDeviceBuildEventLifecycle(virNetClientProgr= amPtr prog G_GNUC_UNUSED, virConnectPtr conn =3D opaque; struct private_data *priv =3D conn->privateData; remote_node_device_event_lifecycle_msg *msg =3D evdata; - virNodeDevicePtr dev; + g_autoptr(virNodeDevice) dev =3D NULL; virObjectEventPtr event =3D NULL; =20 dev =3D get_nonnull_node_device(conn, msg->dev); @@ -5527,7 +5527,6 @@ remoteNodeDeviceBuildEventLifecycle(virNetClientProgr= amPtr prog G_GNUC_UNUSED, =20 event =3D virNodeDeviceEventLifecycleNew(dev->name, msg->event, msg->detail); - virObjectUnref(dev); =20 virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } @@ -5540,7 +5539,7 @@ remoteNodeDeviceBuildEventUpdate(virNetClientProgramP= tr prog G_GNUC_UNUSED, virConnectPtr conn =3D opaque; struct private_data *priv =3D conn->privateData; remote_node_device_event_update_msg *msg =3D evdata; - virNodeDevicePtr dev; + g_autoptr(virNodeDevice) dev =3D NULL; virObjectEventPtr event =3D NULL; =20 dev =3D get_nonnull_node_device(conn, msg->dev); @@ -5548,7 +5547,6 @@ remoteNodeDeviceBuildEventUpdate(virNetClientProgramP= tr prog G_GNUC_UNUSED, return; =20 event =3D virNodeDeviceEventUpdateNew(dev->name); - virObjectUnref(dev); =20 virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 1cfafe3742..6869311f06 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -201,6 +201,7 @@ my %gobject_impl =3D ( virInterface =3D> 1, virNetwork =3D> 1, virNetworkPort =3D> 1, + virNodeDevice =3D> 1, virNWFilter =3D> 1, virNWFilterBinding =3D> 1, virStoragePool =3D> 1, @@ -596,13 +597,11 @@ elsif ($mode eq "server") { !($argtype =3D~ m/^remote_node_device_create_xml_/) and !($argtype =3D~ m/^remote_node_device_lookup_scsi_host_by_= wwn_/)) { $has_node_device =3D 1; - push(@vars_list, "virNodeDevicePtr dev =3D NULL"); + push(@vars_list, "g_autoptr(virNodeDevice) dev =3D NULL"); push(@getters_list, " if (!(dev =3D get_nonnull_node_device_name($conn= _var, args->name)))\n" . " goto cleanup;\n"); push(@args_list, "dev"); - push(@free_list, - " virObjectUnref(dev);"); } =20 foreach my $args_member (@{$call->{args_members}}) { diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 5b9a49d685..c4065eb00a 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -7451,7 +7451,8 @@ testNodeDeviceCreateXML(virConnectPtr conn, { testDriverPtr driver =3D conn->privateData; virNodeDeviceDefPtr def =3D NULL; - virNodeDevicePtr dev =3D NULL, ret =3D NULL; + g_autoptr(virNodeDevice) dev =3D NULL; + virNodeDevicePtr ret =3D NULL; virNodeDeviceObjPtr obj =3D NULL; virNodeDeviceDefPtr objdef; g_autofree char *wwnn =3D NULL; @@ -7494,7 +7495,6 @@ testNodeDeviceCreateXML(virConnectPtr conn, cleanup: virNodeDeviceObjEndAPI(&obj); virNodeDeviceDefFree(def); - virObjectUnref(dev); return ret; } =20 --=20 2.25.3