From nobody Mon Feb 9 21:03:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1585927041; cv=none; d=zohomail.com; s=zohoarc; b=a6BBOIhgryYOvqUcxR1OhoWEapZXX92j8+T7py/GjUCwvN5PUyx2oEa7jT2XZJCW8NPamdRZwGlCFjM5+u20LkvkfFvPo1UOGbZXVhNh7eJs9HO+Esme7cFtaGJUpP9pN83U3ZXZtYDrzN4N8pNaYGR8WWQcdsp3ar+XSLifDAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585927041; 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=AO1ZLJqlJ+jtAsZukDCRCGxTri8T6bHTM8BUi3JcLOo=; b=hlva1V1SUDsD2rQUBkq44Pbwg+GQkMFQutmNLvOnEQo/QMb2rLTrrabLR+t5KMmR+O7bAY5c0nD+2HN7BuFseyfib5VHHTokV1KjOwdmrv0qB2DuTQnIh1o1JKGvPLNfrROBl3Kul92B6IsKCfpL2VJIT94Xfdd4HwQStkdLino= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1585927041164165.30644910661965; Fri, 3 Apr 2020 08:17:21 -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-328-f9Cbeex1OjSK5-xeorzZNw-1; Fri, 03 Apr 2020 11:17:16 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 37A9D149C0; Fri, 3 Apr 2020 15:17:10 +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 02DA05C1D6; Fri, 3 Apr 2020 15:17:10 +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 A1B664E47B; Fri, 3 Apr 2020 15:17:09 +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 033FGuT0028326 for ; Fri, 3 Apr 2020 11:16:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id E2E22202A942; Fri, 3 Apr 2020 15:16:55 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DE9D3202A941 for ; Fri, 3 Apr 2020 15:16:55 +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 BF1F48FF67B for ; Fri, 3 Apr 2020 15:16:55 +0000 (UTC) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-341-wz6GoFAgPf6EajmcLQh-6Q-1; Fri, 03 Apr 2020 11:16:53 -0400 Received: by mail-wm1-f49.google.com with SMTP id c195so2348839wme.1 for ; Fri, 03 Apr 2020 08:16:53 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 08:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585927039; 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=AO1ZLJqlJ+jtAsZukDCRCGxTri8T6bHTM8BUi3JcLOo=; b=G6MP01MhKuBuIcd8P0dQ78dPm3l2e4OYENaVFvaemBoEp2IWIgmBpQmP1ZP8YhkeYfHkCN MsBukCT7DdOFdPVOs6h2COBa5bhjcDRs1o7xb4T2zSt0kJzsIO+eNJo2nD7lb9Afr0pDYk uMuhSAhhvvwFS9PmzQS9JH/k0VpR4Kk= X-MC-Unique: f9Cbeex1OjSK5-xeorzZNw-1 X-MC-Unique: wz6GoFAgPf6EajmcLQh-6Q-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=j5ji0EkhhW6rqPwGjcQngNSOXJMkWaqjUbIUdhHG+Qs=; b=q0vPf73Ne9g3zPFYhTX0zKPtSeMVWpm0cJoYVCEbgxyNrGlD+aQ4helj3goSfQHRpn IT8Lzx/FmdKhW/8N+7rYUIUmXXnZpAbODQNWrxID1wuSKiREIDt97ssP5+AIylXSjBdA lL7bBkdatoSKEDpXt6vbWMkAEYGAGZdg10EOEDAjkbzINIkynB3iTB8Oeb7wjRm+qvXQ 4eAY/r3bpE7ymAkSEy8iq2Zpq5GwO1cpUUo0r6Fvdfle4ly0LOM+pZBuRgKyvo0IpQmb Vd7w2gMyaAoCM7yTgYKrEyrG2poeFlaGQ//vAqUm77JieoLVrcnEaH3QO53sNlKtHLHJ Aifg== X-Gm-Message-State: AGi0PuaItttjdXbJznOv3lpzRYTMdtaRu9srv+daDYdSbMQ9st/A8jxM YXVQt4wJEdPTar+2hNnn5RR3w6CpFDk= X-Google-Smtp-Source: APiQypKoOGefiT2J4ndRA6BJcGFuB/xbrBCY3CZAYiwqfM4wOG2T/K24SkiqKequKYW4ygbfJQT0LA== X-Received: by 2002:a1c:4486:: with SMTP id r128mr9501065wma.32.1585927011520; Fri, 03 Apr 2020 08:16:51 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH 24/36] datatypes: convert virNodeDevice to GObject Date: Fri, 3 Apr 2020 17:15:52 +0200 Message-Id: <20200403151604.106616-25-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.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 033FGuT0028326 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.16 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 | 9 +++----- src/conf/node_device_util.c | 4 ++-- src/conf/virnodedeviceobj.c | 10 ++++++-- src/datatypes.c | 44 ++++++++++++++++++++++-------------- src/datatypes.h | 14 +++++++----- src/libvirt-nodedev.c | 6 ++--- src/libvirt_private.syms | 1 - src/libxl/libxl_driver.c | 9 +++----- src/qemu/qemu_driver.c | 9 +++----- src/remote/remote_driver.c | 4 ++-- src/rpc/gendispatch.pl | 2 +- src/test/test_driver.c | 2 +- 12 files changed, 61 insertions(+), 53 deletions(-) diff --git a/src/conf/node_device_event.c b/src/conf/node_device_event.c index c6915be593..cc2cdd9352 100644 --- a/src/conf/node_device_event.c +++ b/src/conf/node_device_event.c @@ -110,7 +110,7 @@ virNodeDeviceEventDispatchDefaultFunc(virConnectPtr con= n, virConnectObjectEventGenericCallback= cb, void *cbopaque) { - virNodeDevicePtr dev =3D virGetNodeDevice(conn, + g_autoptr(virNodeDevice) dev =3D virGetNodeDevice(conn, event->meta.name); =20 if (!dev) @@ -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..5ee2db8b01 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,14 @@ virNodeDeviceObjListExport(virConnectPtr conn, return data.ndevices; =20 cleanup: - virObjectListFree(data.devices); + if (data.devices) { + while (data.ndevices--) { + if (data.devices[data.ndevices]) + g_object_unref(data.devices[data.ndevices]); + } + } + VIR_FREE(data.devices); + return -1; } =20 diff --git a/src/datatypes.c b/src/datatypes.c index 1f811e5f5e..43767b9fb5 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 @@ -127,6 +125,22 @@ vir_network_port_class_init(virNetworkPortClass *klass) obj->finalize =3D virNetworkPortFinalize; } =20 +G_DEFINE_TYPE(virNodeDevice, vir_node_device, G_TYPE_OBJECT); +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->finalize =3D virNodeDeviceFinalize; +} + G_DEFINE_TYPE(virNWFilter, vir_nw_filter, G_TYPE_OBJECT); static void virNWFilterFinalize(GObject *obj); =20 @@ -243,7 +257,6 @@ virDataTypesOnceInit(void) DECLARE_CLASS_LOCKABLE(virConnect); DECLARE_CLASS_LOCKABLE(virConnectCloseCallbackData); DECLARE_CLASS(virDomain); - DECLARE_CLASS(virNodeDevice); DECLARE_CLASS(virSecret); DECLARE_CLASS(virStream); =20 @@ -794,37 +807,32 @@ 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 /** - * virNodeDeviceDispose: + * virNodeDeviceFinalize: * @obj: the node device to release * * Unconditionally release all memory associated with a device. @@ -834,15 +842,17 @@ virGetNodeDevice(virConnectPtr conn, const char *name) * which may also be released if its ref count hits zero. */ 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 7fab565a7c..3b9a31920b 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 @@ -60,6 +59,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 @@ -249,8 +251,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 (!G_IS_OBJECT(_node) || !(G_OBJECT_TYPE(_node) =3D=3D VIR_TYPE_= NODE_DEVICE) || \ !virObjectIsClass(_node->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_NODEDEV, \ VIR_ERR_INVALID_NODE_DEVICE, \ @@ -263,8 +265,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 (!G_IS_OBJECT(_dev) || !(G_OBJECT_TYPE(_dev) =3D=3D VIR_TYPE_NO= DE_DEVICE) || \ !virObjectIsClass(_dev->conn, virConnectClass)) { \ virReportErrorHelper(VIR_FROM_NODEDEV, \ VIR_ERR_INVALID_NODE_DEVICE, \ @@ -731,7 +733,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 7bee97f2dc..f2187b7cce 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1365,7 +1365,6 @@ virGetStoragePool; virGetStorageVol; virGetStream; virNewConnectCloseCallbackData; -virNodeDeviceClass; virSecretClass; virStreamClass; =20 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 6564b45ee4..bd43f3310e 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5788,7 +5788,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 @@ -5838,7 +5838,6 @@ libxlNodeDeviceDetachFlags(virNodeDevicePtr dev, cleanup: virPCIDeviceFree(pci); virNodeDeviceDefFree(def); - virObjectUnref(nodedev); virObjectUnref(nodeconn); VIR_FREE(xml); return ret; @@ -5861,7 +5860,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; @@ -5902,7 +5901,6 @@ libxlNodeDeviceReAttach(virNodeDevicePtr dev) cleanup: virPCIDeviceFree(pci); virNodeDeviceDefFree(def); - virObjectUnref(nodedev); virObjectUnref(nodeconn); VIR_FREE(xml); return ret; @@ -5919,7 +5917,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; @@ -5960,7 +5958,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 864158fd9d..bc28f65a3a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12963,7 +12963,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 @@ -13024,7 +13024,6 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, cleanup: virPCIDeviceFree(pci); virNodeDeviceDefFree(def); - virObjectUnref(nodedev); virObjectUnref(nodeconn); return ret; } @@ -13046,7 +13045,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; @@ -13084,7 +13083,6 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) virPCIDeviceFree(pci); cleanup: virNodeDeviceDefFree(def); - virObjectUnref(nodedev); virObjectUnref(nodeconn); return ret; } @@ -13100,7 +13098,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; @@ -13138,7 +13136,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 f5d7842104..a3f05563d4 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5536,7 +5536,7 @@ remoteNodeDeviceBuildEventLifecycle(virNetClientProgr= amPtr prog G_GNUC_UNUSED, =20 event =3D virNodeDeviceEventLifecycleNew(dev->name, msg->event, msg->detail); - virObjectUnref(dev); + g_object_unref(dev); =20 virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } @@ -5557,7 +5557,7 @@ remoteNodeDeviceBuildEventUpdate(virNetClientProgramP= tr prog G_GNUC_UNUSED, return; =20 event =3D virNodeDeviceEventUpdateNew(dev->name); - virObjectUnref(dev); + g_object_unref(dev); =20 virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 0b2ae59910..3187a0b798 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -575,7 +575,7 @@ elsif ($mode eq "server") { " goto cleanup;\n"); push(@args_list, "dev"); push(@free_list, - " virObjectUnref(dev);"); + " g_object_unref(dev);"); } =20 foreach my $args_member (@{$call->{args_members}}) { diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1696b956fe..5195ccbb61 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -7496,7 +7496,7 @@ testNodeDeviceCreateXML(virConnectPtr conn, cleanup: virNodeDeviceObjEndAPI(&obj); virNodeDeviceDefFree(def); - virObjectUnref(dev); + g_object_unref(dev); return ret; } =20 --=20 2.25.1