From nobody Wed May 15 17:44:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657810354; cv=none; d=zohomail.com; s=zohoarc; b=NvovIZmchdgb0HJRCU1Hnit56Cet9NZoM5SHFcY2OEZI18zmv5VbiOiSpAX5Iy/QaFKSVmugX/99gbRNlX1rKHf5j3eK99HQ8zdkfxBBclQv51FwduoI7gvO6sjLCxEDBb9G8eZZcG+tqqOSu3kUTphg9gWZdDIKvG1+2oWR+zU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657810354; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=re0+o6yzuUB4x2jCgA1k2itpbGTwssCiGNJGzIbRLaY=; b=e1NDb8u1LVdJS9G+TC9+cP2nmRX1+R/HsxIFDdA+K0R1x9ID/iE8uGQ+avyKikJsdTW0g6cjDIuvuRv3qTFzTLw7C482r3o9Sy8LnGBBEDaZxmyIdATdzsi0N4qulqv7/pPAZ9QtL/S3clAQ2IvwFzZ6KHKPgF2qI+ieio8TI+M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1657810354312299.98433533349987; Thu, 14 Jul 2022 07:52:34 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-248-R7TUlXgGP4OeWJCdjJz6ug-1; Thu, 14 Jul 2022 10:52:31 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C5B2F108C0C1; Thu, 14 Jul 2022 14:52:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E218C1121314; Thu, 14 Jul 2022 14:52:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AE709194706C; Thu, 14 Jul 2022 14:52:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6CC661947042 for ; Thu, 14 Jul 2022 14:52:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3B6292026D07; Thu, 14 Jul 2022 14:52:26 +0000 (UTC) Received: from himantopus.redhat.com (unknown [10.22.10.33]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F2A342026D64 for ; Thu, 14 Jul 2022 14:52:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657810353; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=re0+o6yzuUB4x2jCgA1k2itpbGTwssCiGNJGzIbRLaY=; b=CsCgoXzJFZYWbeBSCwaTs+1juijtsbbih4MWc+KYW4Iw3Ul6g4SgwePADxti5pY7XTlXWs 6NhFUSKg67OaqLwqQHRduvTqSyR7AXsY51oXxyL6CG5Li02g0RdLBkuUFNhopXP6LmX4kC bpyLKKDWU3WjWYTWs0CHfyfdZbyyF5Q= X-MC-Unique: R7TUlXgGP4OeWJCdjJz6ug-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jonathon Jongsma To: libvir-list@redhat.com Subject: [libvirt PATCH] util: remove virObjectUnref() adapters Date: Thu, 14 Jul 2022 09:52:25 -0500 Message-Id: <20220714145225.3959236-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657810355544100001 Content-Type: text/plain; charset="utf-8"; x-default="true" These wrapper functions were used to adapt the virObjectUnref() function signature for different callbacks. But in commit 0d184072, the virObjectUnref() function was changed to return a void instead of a bool, so these adapters are no longer necessary. Signed-off-by: Jonathon Jongsma Reviewed-by: Erik Skultety --- src/admin/admin_remote.c | 4 ++-- src/bhyve/bhyve_monitor.c | 2 +- src/conf/object_event.c | 2 +- src/conf/virdomainobjlist.c | 8 ++++---- src/conf/virinterfaceobj.c | 2 +- src/conf/virnetworkobj.c | 2 +- src/conf/virnodedeviceobj.c | 2 +- src/conf/virnwfilterbindingobjlist.c | 4 ++-- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 10 +++++----- src/libvirt_private.syms | 2 -- src/qemu/qemu_domain.c | 2 +- src/remote/remote_daemon_stream.c | 2 +- src/remote/remote_driver.c | 8 ++++---- src/rpc/gendispatch.pl | 2 +- src/rpc/virkeepalive.c | 2 +- src/rpc/virnetclient.c | 4 ++-- src/rpc/virnetclientstream.c | 2 +- src/rpc/virnetdaemon.c | 2 +- src/rpc/virnetserverclient.c | 4 ++-- src/rpc/virnetserverservice.c | 6 +++--- src/util/virobject.c | 30 ---------------------------- src/util/virobject.h | 6 ------ tests/qemustatusxml2xmltest.c | 2 +- tests/qemuxml2argvtest.c | 2 +- tests/qemuxml2xmltest.c | 2 +- tools/virsh-console.c | 6 +++--- 27 files changed, 42 insertions(+), 80 deletions(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index 83a6be2b97..012488bff3 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -165,7 +165,7 @@ remoteAdminConnectOpen(virAdmConnectPtr conn, unsigned = int flags) virObjectRef(conn->closeCallback); virNetClientSetCloseCallback(priv->client, remoteAdminClientCloseFunc, conn->closeCallback, - virObjectFreeCallback); + virObjectUnref); =20 if (call(conn, 0, ADMIN_PROC_CONNECT_OPEN, (xdrproc_t)xdr_admin_connect_open_args, (char *)&args, @@ -195,7 +195,7 @@ remoteAdminConnectClose(virAdmConnectPtr conn) } =20 virNetClientSetCloseCallback(priv->client, NULL, conn->closeCallback, - virObjectFreeCallback); + virObjectUnref); virNetClientClose(priv->client); =20 rv =3D 0; diff --git a/src/bhyve/bhyve_monitor.c b/src/bhyve/bhyve_monitor.c index 6788b83c70..ae602b5c39 100644 --- a/src/bhyve/bhyve_monitor.c +++ b/src/bhyve/bhyve_monitor.c @@ -82,7 +82,7 @@ bhyveMonitorRegister(bhyveMonitor *mon) VIR_EVENT_HANDLE_HANGUP, bhyveMonitorIO, mon, - virObjectFreeCallback); + virObjectUnref); if (mon->watch < 0) { VIR_DEBUG("failed to add event handle for mon %p", mon); virObjectUnref(mon); diff --git a/src/conf/object_event.c b/src/conf/object_event.c index 3c998eda7f..62bbfb33bc 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -876,7 +876,7 @@ virObjectEventStateRegisterID(virConnectPtr conn, if ((state->timer =3D virEventAddTimeout(-1, virObjectEventTimer, state, - virObjectFreeCallback)) < 0= ) { + virObjectUnref)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("could not initialize domain event timer")); goto cleanup; diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index f16b963eb0..2569454ff8 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -73,8 +73,8 @@ virDomainObjList *virDomainObjListNew(void) if (!(doms =3D virObjectRWLockableNew(virDomainObjListClass))) return NULL; =20 - doms->objs =3D virHashNew(virObjectFreeHashData); - doms->objsName =3D virHashNew(virObjectFreeHashData); + doms->objs =3D virHashNew(virObjectUnref); + doms->objsName =3D virHashNew(virObjectUnref); return doms; } =20 @@ -217,7 +217,7 @@ virDomainObjListFindByName(virDomainObjList *doms, * tables. Once successfully added into a table, increase the * reference count since upon removal in virHashRemoveEntry * the virObjectUnref will be called since the hash tables were - * configured to call virObjectFreeHashData when the object is + * configured to call virObjectUnref when the object is * removed from the hash table. * * Returns 0 on success with 3 references and locked @@ -453,7 +453,7 @@ virDomainObjListRename(virDomainObjList *doms, =20 /* Increment the refcnt for @new_name. We're about to remove * the @old_name which will cause the refcnt to be decremented - * via the virObjectUnref call made during the virObjectFreeHashData + * via the virObjectUnref call made during the virObjectUnref * as a result of removing something from the object list hash * table as set up during virDomainObjListNew. */ virObjectRef(dom); diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index c2b81b984f..1ec1c9d1b7 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -140,7 +140,7 @@ virInterfaceObjListNew(void) if (!(interfaces =3D virObjectRWLockableNew(virInterfaceObjListClass))) return NULL; =20 - interfaces->objsName =3D virHashNew(virObjectFreeHashData); + interfaces->objsName =3D virHashNew(virObjectUnref); =20 return interfaces; } diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index ddb325cdbd..46b499db58 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -326,7 +326,7 @@ virNetworkObjListNew(void) if (!(nets =3D virObjectRWLockableNew(virNetworkObjListClass))) return NULL; =20 - nets->objs =3D virHashNew(virObjectFreeHashData); + nets->objs =3D virHashNew(virObjectUnref); =20 return nets; } diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 26498fc498..4c22484d11 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -465,7 +465,7 @@ virNodeDeviceObjListNew(void) if (!(devs =3D virObjectRWLockableNew(virNodeDeviceObjListClass))) return NULL; =20 - devs->objs =3D virHashNew(virObjectFreeHashData); + devs->objs =3D virHashNew(virObjectUnref); =20 return devs; } diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbin= dingobjlist.c index 53713d815a..9a46fa06b9 100644 --- a/src/conf/virnwfilterbindingobjlist.c +++ b/src/conf/virnwfilterbindingobjlist.c @@ -66,7 +66,7 @@ virNWFilterBindingObjListNew(void) if (!(bindings =3D virObjectRWLockableNew(virNWFilterBindingObjListCla= ss))) return NULL; =20 - bindings->objs =3D virHashNew(virObjectFreeHashData); + bindings->objs =3D virHashNew(virObjectUnref); =20 return bindings; } @@ -131,7 +131,7 @@ virNWFilterBindingObjListFindByPortDev(virNWFilterBindi= ngObjList *bindings, * tables. Once successfully added into a table, increase the * reference count since upon removal in virHashRemoveEntry * the virObjectUnref will be called since the hash tables were - * configured to call virObjectFreeHashData when the object is + * configured to call virObjectUnref when the object is * removed from the hash table. * * Returns 0 on success with 2 references and locked diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 92985c4b63..4032cd1e9a 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -118,7 +118,7 @@ virSecretObjListNew(void) if (!(secrets =3D virObjectRWLockableNew(virSecretObjListClass))) return NULL; =20 - if (!(secrets->objs =3D virHashNew(virObjectFreeHashData))) { + if (!(secrets->objs =3D virHashNew(virObjectUnref))) { virObjectUnref(secrets); return NULL; } diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 238d4678a2..e1465c8376 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -151,9 +151,9 @@ virStorageVolObjListNew(void) if (!(vols =3D virObjectRWLockableNew(virStorageVolObjListClass))) return NULL; =20 - vols->objsKey =3D virHashNew(virObjectFreeHashData); - vols->objsName =3D virHashNew(virObjectFreeHashData); - vols->objsPath =3D virHashNew(virObjectFreeHashData); + vols->objsKey =3D virHashNew(virObjectUnref); + vols->objsName =3D virHashNew(virObjectUnref); + vols->objsPath =3D virHashNew(virObjectUnref); =20 return vols; } @@ -378,8 +378,8 @@ virStoragePoolObjListNew(void) if (!(pools =3D virObjectRWLockableNew(virStoragePoolObjListClass))) return NULL; =20 - pools->objs =3D virHashNew(virObjectFreeHashData); - pools->objsName =3D virHashNew(virObjectFreeHashData); + pools->objs =3D virHashNew(virObjectUnref); + pools->objsName =3D virHashNew(virObjectUnref); =20 return pools; } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1e757389e6..f4732f1742 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2978,8 +2978,6 @@ virClassForObjectRWLockable; virClassIsDerivedFrom; virClassName; virClassNew; -virObjectFreeCallback; -virObjectFreeHashData; virObjectIsClass; virObjectListFree; virObjectListFreeCount; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 60ed358871..94b2e3118c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1764,7 +1764,7 @@ qemuDomainObjPrivateAlloc(void *opaque) if (!(priv->devs =3D virChrdevAlloc())) return NULL; =20 - priv->blockjobs =3D virHashNew(virObjectFreeHashData); + priv->blockjobs =3D virHashNew(virObjectUnref); =20 /* agent commands block by default, user can choose different behavior= */ priv->agentTimeout =3D VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_BLOCK; diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_s= tream.c index 645be6eafd..912f3f9f94 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -440,7 +440,7 @@ int daemonAddClientStream(virNetServerClient *client, =20 if (virStreamEventAddCallback(stream->st, 0, daemonStreamEvent, client, - virObjectFreeCallback) < 0) + virObjectUnref) < 0) return -1; =20 virObjectRef(client); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 94566069f0..0ca365c4cc 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1096,7 +1096,7 @@ doRemoteOpen(virConnectPtr conn, virObjectRef(priv->closeCallback); virNetClientSetCloseCallback(priv->client, remoteClientCloseFunc, - priv->closeCallback, virObjectFreeCallbac= k); + priv->closeCallback, virObjectUnref); =20 if (!(priv->remoteProgram =3D virNetClientProgramNew(REMOTE_PROGRAM, REMOTE_PROTOCOL_VER= SION, @@ -1301,7 +1301,7 @@ doRemoteClose(virConnectPtr conn, struct private_data= *priv) =20 virNetClientSetCloseCallback(priv->client, NULL, - priv->closeCallback, virObjectFreeCallbac= k); + priv->closeCallback, virObjectUnref); =20 virNetClientClose(priv->client); g_clear_pointer(&priv->client, virObjectUnref); @@ -6142,7 +6142,7 @@ remoteDomainMigratePrepareTunnel3(virConnectPtr dconn, =20 st->driver =3D &remoteStreamDrv; st->privateData =3D netst; - st->ff =3D virObjectFreeCallback; + st->ff =3D virObjectUnref; =20 args.cookie_in.cookie_in_val =3D (char *)cookiein; args.cookie_in.cookie_in_len =3D cookieinlen; @@ -7082,7 +7082,7 @@ remoteDomainMigratePrepareTunnel3Params(virConnectPtr= dconn, =20 st->driver =3D &remoteStreamDrv; st->privateData =3D netst; - st->ff =3D virObjectFreeCallback; + st->ff =3D virObjectUnref; =20 if (call(dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE_TUNNEL3_PA= RAMS, (xdrproc_t) xdr_remote_domain_migrate_prepare_tunnel3_params_= args, diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index a64ff3e73f..5f2b163ea0 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -1837,7 +1837,7 @@ elsif ($mode eq "client") { print "\n"; print " st->driver =3D &remoteStreamDrv;\n"; print " st->privateData =3D netst;\n"; - print " st->ff =3D virObjectFreeCallback;\n"; + print " st->ff =3D virObjectUnref;\n"; } =20 if ($call->{ProcName} eq "SupportsFeature") { diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index b7ee6fb169..434cc2c7c9 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -275,7 +275,7 @@ virKeepAliveStart(virKeepAlive *ka, timeout =3D ka->interval - delay; ka->intervalStart =3D now - (ka->interval - timeout); ka->timer =3D virEventAddTimeout(timeout * 1000, virKeepAliveTimer, - ka, virObjectFreeCallback); + ka, virObjectUnref); if (ka->timer < 0) goto cleanup; =20 diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 3f79c03a58..1202b0f30c 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -658,7 +658,7 @@ int virNetClientRegisterAsyncIO(virNetClient *client) VIR_EVENT_HANDLE_READABLE, virNetClientIncomingEvent, client, - virObjectFreeCallback) < 0) { + virObjectUnref) < 0) { virObjectUnref(client); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to register async IO callback")); @@ -688,7 +688,7 @@ int virNetClientRegisterKeepAlive(virNetClient *client) if (!(ka =3D virKeepAliveNew(-1, 0, client, virNetClientKeepAliveSendCB, virNetClientKeepAliveDeadCB, - virObjectFreeCallback))) + virObjectUnref))) return -1; =20 /* keepalive object has a reference to client */ diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index a03f67e542..e0e3178111 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -727,7 +727,7 @@ int virNetClientStreamEventAddCallback(virNetClientStre= am *st, virEventAddTimeout(-1, virNetClientStreamEventTimer, st, - virObjectFreeCallback)) < 0) { + virObjectUnref)) < 0) { virObjectUnref(st); goto cleanup; } diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index ac12d2d412..c4f5bbdce5 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -142,7 +142,7 @@ virNetDaemonNew(void) if (!(dmn =3D virObjectLockableNew(virNetDaemonClass))) return NULL; =20 - dmn->servers =3D virHashNew(virObjectFreeHashData); + dmn->servers =3D virHashNew(virObjectUnref); =20 #ifndef WIN32 dmn->sigwrite =3D dmn->sigread =3D -1; diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index bb70856351..d57ca07167 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -202,7 +202,7 @@ static int virNetServerClientRegisterEvent(virNetServer= Client *client) mode, virNetServerClientDispatchEvent, client, - virObjectFreeCallback) < 0) { + virObjectUnref) < 0) { virObjectUnref(client); return -1; } @@ -1521,7 +1521,7 @@ virNetServerClientInitKeepAlive(virNetServerClient *c= lient, if (!(ka =3D virKeepAliveNew(interval, count, client, virNetServerClientKeepAliveSendCB, virNetServerClientKeepAliveDeadCB, - virObjectFreeCallback))) + virObjectUnref))) return -1; =20 /* keepalive object has a reference to client */ diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index 214eae1acb..682b2091c1 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -152,7 +152,7 @@ virNetServerServiceNewSocket(virNetSocket **socks, =20 virObjectRef(svc); svc->timer =3D virEventAddTimeout(-1, virNetServerServiceTimerFunc, - svc, virObjectFreeCallback); + svc, virObjectUnref); if (svc->timer < 0) { virObjectUnref(svc); goto error; @@ -169,7 +169,7 @@ virNetServerServiceNewSocket(virNetSocket **socks, 0, virNetServerServiceAccept, svc, - virObjectFreeCallback) < 0) { + virObjectUnref) < 0) { virObjectUnref(svc); goto error; } @@ -361,7 +361,7 @@ virNetServerService *virNetServerServiceNewPostExecRest= art(virJSONValue *object) 0, virNetServerServiceAccept, svc, - virObjectFreeCallback) < 0) { + virObjectUnref) < 0) { virObjectUnref(svc); goto error; } diff --git a/src/util/virobject.c b/src/util/virobject.c index d1cd4d32f1..b74d74a545 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -598,36 +598,6 @@ virClassName(virClass *klass) } =20 =20 -/** - * virObjectFreeCallback: - * @opaque: a pointer to a virObject instance - * - * Provides identical functionality to virObjectUnref, - * but with the signature matching the virFreeCallback - * typedef. - */ -void virObjectFreeCallback(void *opaque) -{ - virObjectUnref(opaque); -} - - -/** - * virObjectFreeHashData: - * @opaque: a pointer to a virObject instance - * @name: ignored, name of the hash key being deleted - * - * Provides identical functionality to virObjectUnref, - * but with the signature matching the GDestroyNotify - * typedef used with hash tables. - */ -void -virObjectFreeHashData(void *opaque) -{ - virObjectUnref(opaque); -} - - /** * virObjectListFree: * @list: A pointer to a NULL-terminated list of object pointers to free diff --git a/src/util/virobject.h b/src/util/virobject.h index 4b941ac215..8c06c1b929 100644 --- a/src/util/virobject.h +++ b/src/util/virobject.h @@ -104,12 +104,6 @@ virObjectIsClass(void *obj, virClass *klass) ATTRIBUTE_NONNULL(2); =20 -void -virObjectFreeCallback(void *opaque); - -void -virObjectFreeHashData(void *opaque); - void * virObjectLockableNew(virClass *klass) ATTRIBUTE_NONNULL(1); diff --git a/tests/qemustatusxml2xmltest.c b/tests/qemustatusxml2xmltest.c index cd43820551..db82a1a980 100644 --- a/tests/qemustatusxml2xmltest.c +++ b/tests/qemustatusxml2xmltest.c @@ -78,7 +78,7 @@ mymain(void) int ret =3D 0; g_autofree char *fakerootdir =3D NULL; g_autoptr(GHashTable) capslatest =3D testQemuGetLatestCaps(); - g_autoptr(GHashTable) capscache =3D virHashNew(virObjectFreeHashData); + g_autoptr(GHashTable) capscache =3D virHashNew(virObjectUnref); g_autoptr(virConnect) conn =3D NULL; struct testQemuConf testConf =3D { .capslatest =3D capslatest, .capscache =3D capscache, diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5b40a0d7f5..b2da42cb1f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -835,7 +835,7 @@ mymain(void) g_autofree char *fakerootdir =3D NULL; g_autoptr(GHashTable) capslatest =3D testQemuGetLatestCaps(); g_autoptr(GHashTable) qapiSchemaCache =3D virHashNew((GDestroyNotify) = g_hash_table_unref); - g_autoptr(GHashTable) capscache =3D virHashNew(virObjectFreeHashData); + g_autoptr(GHashTable) capscache =3D virHashNew(virObjectUnref); struct testQemuConf testConf =3D { .capslatest =3D capslatest, .capscache =3D capscache, .qapiSchemaCache =3D qapiSchemaCache = }; diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 58929b68c1..68e5041bfd 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -122,7 +122,7 @@ mymain(void) g_autofree char *fakerootdir =3D NULL; g_autoptr(virQEMUDriverConfig) cfg =3D NULL; g_autoptr(GHashTable) capslatest =3D testQemuGetLatestCaps(); - g_autoptr(GHashTable) capscache =3D virHashNew(virObjectFreeHashData); + g_autoptr(GHashTable) capscache =3D virHashNew(virObjectUnref); g_autoptr(virConnect) conn =3D NULL; struct testQemuConf testConf =3D { .capslatest =3D capslatest, .capscache =3D capscache, diff --git a/tools/virsh-console.c b/tools/virsh-console.c index 13ee811a92..6bfb44a190 100644 --- a/tools/virsh-console.c +++ b/tools/virsh-console.c @@ -451,7 +451,7 @@ virshRunConsole(vshControl *ctl, VIR_EVENT_HANDLE_READABLE, virConsoleEventOnStdin, con, - virObjectFreeCallback)) < 0) { + virObjectUnref)) < 0) { virObjectUnref(con); goto cleanup; } @@ -461,7 +461,7 @@ virshRunConsole(vshControl *ctl, 0, virConsoleEventOnStdout, con, - virObjectFreeCallback)) < 0)= { + virObjectUnref)) < 0) { virObjectUnref(con); goto cleanup; } @@ -471,7 +471,7 @@ virshRunConsole(vshControl *ctl, VIR_STREAM_EVENT_READABLE, virConsoleEventOnStream, con, - virObjectFreeCallback) < 0) { + virObjectUnref) < 0) { virObjectUnref(con); goto cleanup; } --=20 2.35.3