From nobody Mon Feb 9 19:54:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1603359495; cv=none; d=zohomail.com; s=zohoarc; b=JRKnYs5ALaSbhFHwPzMSgIomFXZrTADSWJdD5h6tAf9i3+RQRmMaFiGhbvGY89K2f+fWr68G6iosYnhrYPe12Zgr4i6Ii2EJpDl5XpzuVSN/N8SGZ2FFHb/hbco1DJIkS0MLaPqZ6qgC0blEWEaQd/ovLNlNw28PGMYvpZRUjoc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603359495; h=Content-Type:Content-Transfer-Encoding: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=p+HBGIMuSEebIC1zh8JYKc9XAie4zwqZITNU0J9GvMQ=; b=OmqCZ9JLNWHb8KXxG/SmGlPd20T9mgm5KOF+ufgbdeWmn84pNZjSs+g3XXrblEa75EQh4xuR5dMUiHYx/BRhcJjlpnnnSOajxrOBldoJ6/3A7eFVrtxaqjv9BS7IWSix8kcpkN0cO8j/5hh5e/rOp3Rppou0iz2YVQ2RkEj8Znk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603359495269817.3502414823247; Thu, 22 Oct 2020 02:38:15 -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-570-VrTun-D5NsS-R_RVptk66Q-1; Thu, 22 Oct 2020 05:36:00 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AD94A1009E2B; Thu, 22 Oct 2020 09:35:54 +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 8ED2D6EF6B; Thu, 22 Oct 2020 09:35:54 +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 57B8492305; Thu, 22 Oct 2020 09:35:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09M9ZOGr024551 for ; Thu, 22 Oct 2020 05:35:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1AAC35B4C0; Thu, 22 Oct 2020 09:35:24 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64CF65B4A8 for ; Thu, 22 Oct 2020 09:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603359494; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=p+HBGIMuSEebIC1zh8JYKc9XAie4zwqZITNU0J9GvMQ=; b=SHLv4Qnm5OtqkICZkTy6RT7CGkgkhNbWO3QE/PjrryL3hzR5ur+V55k4D+wGNkmJ8kNawY LjweKxzJQIi43InjaVLXkRGaLJSQCRgMQpfRow7vWpXjd8MLVhWiiqJmXEpGt8nb3Da6Zm 13Py8rH6d8psEkARPGTt91YSPGAfI3M= X-MC-Unique: VrTun-D5NsS-R_RVptk66Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 11/15] util: hash: Remove virHashValueFree Date: Thu, 22 Oct 2020 11:35:02 +0200 Message-Id: <0ea0c6f0154ec431590c1a9a31690c5fcef9b496.1603358617.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com 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.13 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) Content-Type: text/plain; charset="utf-8" Use 'g_free' directly. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/conf/domain_addr.c | 2 +- src/hypervisor/virclosecallbacks.c | 2 +- src/libvirt_private.syms | 1 - src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/qemu/qemu_interop_config.c | 2 +- src/qemu/qemu_migration_cookie.c | 2 +- src/qemu/qemu_monitor.c | 6 +++--- src/qemu/qemu_monitor_json.c | 2 +- src/util/virhash.c | 7 ------- src/util/virhash.h | 3 --- tests/qemumonitorjsontest.c | 6 +++--- tests/qemusecuritymock.c | 4 ++-- tests/testutilsqemu.c | 2 +- 13 files changed, 15 insertions(+), 26 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index de344186ec..37dad20ade 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1389,7 +1389,7 @@ virDomainCCWAddressSetCreate(void) addrs =3D g_new0(virDomainCCWAddressSet, 1); - if (!(addrs->defined =3D virHashNew(virHashValueFree))) + if (!(addrs->defined =3D virHashNew(g_free))) goto error; /* must use cssid =3D 0xfe (254) for virtio-ccw devices */ diff --git a/src/hypervisor/virclosecallbacks.c b/src/hypervisor/vircloseca= llbacks.c index 176dd5c263..a73ab818da 100644 --- a/src/hypervisor/virclosecallbacks.c +++ b/src/hypervisor/virclosecallbacks.c @@ -69,7 +69,7 @@ virCloseCallbacksNew(void) if (!(closeCallbacks =3D virObjectLockableNew(virCloseCallbacksClass))) return NULL; - closeCallbacks->list =3D virHashNew(virHashValueFree); + closeCallbacks->list =3D virHashNew(g_free); if (!closeCallbacks->list) { virObjectUnref(closeCallbacks); return NULL; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 36e2c66d93..926e982e0b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2213,7 +2213,6 @@ virHashSearch; virHashSize; virHashSteal; virHashUpdateEntry; -virHashValueFree; # util/virhashcode.h diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_le= arnipaddr.c index 82797d9a64..6dc535a4fe 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -781,7 +781,7 @@ virNWFilterLearnInit(void) if (!pendingLearnReq) return -1; - ifaceLockMap =3D virHashNew(virHashValueFree); + ifaceLockMap =3D virHashNew(g_free); if (!ifaceLockMap) { virNWFilterLearnShutdown(); return -1; diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c index 080674ce2d..53b251f056 100644 --- a/src/qemu/qemu_interop_config.c +++ b/src/qemu/qemu_interop_config.c @@ -125,7 +125,7 @@ qemuInteropFetchConfigs(const char *name, homeConfig =3D g_strdup_printf("%s/qemu/%s", xdgConfig, name); } - if (!(files =3D virHashNew(virHashValueFree))) + if (!(files =3D virHashNew(g_free))) return -1; if (qemuBuildFileList(files, sysLocation) < 0) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index abe797759d..708c2cced7 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -435,7 +435,7 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - g_autoptr(virHashTable) stats =3D virHashNew(virHashValueFree); + g_autoptr(virHashTable) stats =3D virHashNew(g_free); bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); size_t i; int rc; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 51de72b5bf..69d81b20c2 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2137,7 +2137,7 @@ qemuMonitorGetAllBlockStatsInfo(qemuMonitorPtr mon, QEMU_CHECK_MONITOR(mon); - if (!(*ret_stats =3D virHashNew(virHashValueFree))) + if (!(*ret_stats =3D virHashNew(g_free))) goto error; ret =3D qemuMonitorJSONGetAllBlockStatsInfo(mon, *ret_stats, @@ -4289,7 +4289,7 @@ qemuMonitorGetMemoryDeviceInfo(qemuMonitorPtr mon, QEMU_CHECK_MONITOR(mon); - if (!(*info =3D virHashNew(virHashValueFree))) + if (!(*info =3D virHashNew(g_free))) return -1; if ((ret =3D qemuMonitorJSONGetMemoryDeviceInfo(mon, *info)) < 0) { @@ -4593,7 +4593,7 @@ qemuMonitorGetPRManagerInfo(qemuMonitorPtr mon, QEMU_CHECK_MONITOR(mon); - if (!(info =3D virHashNew(virHashValueFree))) + if (!(info =3D virHashNew(g_free))) goto cleanup; if (qemuMonitorJSONGetPRManagerInfo(mon, info) < 0) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 91cc0c9046..2689ad50b9 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5126,7 +5126,7 @@ qemuMonitorJSONGetAllBlockJobInfo(qemuMonitorPtr mon, } nr_results =3D virJSONValueArraySize(data); - if (!(blockJobs =3D virHashNew(virHashValueFree))) + if (!(blockJobs =3D virHashNew(g_free))) goto cleanup; for (i =3D 0; i < nr_results; i++) { diff --git a/src/util/virhash.c b/src/util/virhash.c index ce09f8f248..c781e1d5a5 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -111,13 +111,6 @@ static void virHashStrFree(void *name) } -void -virHashValueFree(void *value) -{ - VIR_FREE(value); -} - - static size_t virHashComputeKey(const virHashTable *table, const void *name) { diff --git a/src/util/virhash.h b/src/util/virhash.h index b136455f1f..2d221dce25 100644 --- a/src/util/virhash.h +++ b/src/util/virhash.h @@ -202,7 +202,4 @@ ssize_t virHashRemoveSet(virHashTablePtr table, virHash= Searcher iter, const void void *virHashSearch(const virHashTable *table, virHashSearcher iter, const void *data, void **name); -/* Convenience for when VIR_FREE(value) is sufficient as a data freer. */ -void virHashValueFree(void *value); - G_DEFINE_AUTOPTR_CLEANUP_FUNC(virHashTable, virHashFree); diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index f50ecdeb3f..da7fd4625a 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1649,8 +1649,8 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const = void *opaque) if (!(test =3D qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; - if (!(blockDevices =3D virHashNew(virHashValueFree)) || - !(expectedBlockDevices =3D virHashNew(virHashValueFree))) + if (!(blockDevices =3D virHashNew(g_free)) || + !(expectedBlockDevices =3D virHashNew(g_free))) goto cleanup; info =3D g_new0(struct qemuDomainDiskInfo, 1); @@ -1811,7 +1811,7 @@ testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInf= o(const void *opaque) if (!(test =3D qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; - if (!(blockstats =3D virHashNew(virHashValueFree))) + if (!(blockstats =3D virHashNew(g_free))) goto cleanup; if (qemuMonitorTestAddItem(test, "query-blockstats", reply) < 0) diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c index c1344b3daa..839be55665 100644 --- a/tests/qemusecuritymock.c +++ b/tests/qemusecuritymock.c @@ -85,12 +85,12 @@ init_hash(void) if (xattr_paths) return; - if (!(xattr_paths =3D virHashNew(virHashValueFree))) { + if (!(xattr_paths =3D virHashNew(g_free))) { fprintf(stderr, "Unable to create hash table for XATTR paths\n"); abort(); } - if (!(chown_paths =3D virHashNew(virHashValueFree))) { + if (!(chown_paths =3D virHashNew(g_free))) { fprintf(stderr, "Unable to create hash table for chowned paths\n"); abort(); } diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 3f50d46d87..4defba0b7b 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -576,7 +576,7 @@ testQemuGetLatestCaps(void) virHashTablePtr capslatest; size_t i; - if (!(capslatest =3D virHashNew(virHashValueFree))) + if (!(capslatest =3D virHashNew(g_free))) goto error; VIR_TEST_VERBOSE(""); --=20 2.26.2