util: hash: Remove virHashValueFree

Use 'g_free' directly.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index de344186ec570d01516a8f048ce89dc1ad18e0c6..37dad20adee9029570f6b7f9aa12cbfa43316367 100644 (file)
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -1389,7 +1389,7 @@ virDomainCCWAddressSetCreate(void)
 
     addrs = g_new0(virDomainCCWAddressSet, 1);
 
-    if (!(addrs->defined = virHashNew(virHashValueFree)))
+    if (!(addrs->defined = virHashNew(g_free)))
         goto error;
 
     /* must use cssid = 0xfe (254) for virtio-ccw devices */

diff --git a/src/hypervisor/virclosecallbacks.c b/src/hypervisor/virclosecallbacks.c
index 176dd5c2635397d963509ddde101a127140f9e61..a73ab818daa5fb26ccd42315ab0c7827dfc16a61 100644 (file)
--- a/src/hypervisor/virclosecallbacks.c
+++ b/src/hypervisor/virclosecallbacks.c
@@ -69,7 +69,7 @@ virCloseCallbacksNew(void)
     if (!(closeCallbacks = virObjectLockableNew(virCloseCallbacksClass)))
         return NULL;
 
-    closeCallbacks->list = virHashNew(virHashValueFree);
+    closeCallbacks->list = virHashNew(g_free);
     if (!closeCallbacks->list) {
         virObjectUnref(closeCallbacks);
         return NULL;

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 36e2c66d93949fc0277a221e73331c8f19d9df37..926e982e0b24956b8cb6b28728e88682da27ca01 100644 (file)
--- 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_learnipaddr.c
index 82797d9a6408fec22bbaf590b7c51cab6bb56f45..6dc535a4fe2ebe84055c5af1366dfa9a6ce5abe9 100644 (file)
--- a/src/nwfilter/nwfilter_learnipaddr.c
+++ b/src/nwfilter/nwfilter_learnipaddr.c
@@ -781,7 +781,7 @@ virNWFilterLearnInit(void)
     if (!pendingLearnReq)
         return -1;
 
-    ifaceLockMap = virHashNew(virHashValueFree);
+    ifaceLockMap = 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 080674ce2ddce5afaba6a52501dcbdc35570a135..53b251f0562819bc4c8a9913534d38dd454765d4 100644 (file)
--- a/src/qemu/qemu_interop_config.c
+++ b/src/qemu/qemu_interop_config.c
@@ -125,7 +125,7 @@ qemuInteropFetchConfigs(const char *name,
         homeConfig = g_strdup_printf("%s/qemu/%s", xdgConfig, name);
     }
 
-    if (!(files = virHashNew(virHashValueFree)))
+    if (!(files = virHashNew(g_free)))
         return -1;
 
     if (qemuBuildFileList(files, sysLocation) < 0)

diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
index abe797759dea5056b1dc585896a289eb458dada5..708c2cced7a2018ccc5cc9a0cde9d2539f902220 100644 (file)
--- 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 = vm->privateData;
-    g_autoptr(virHashTable) stats = virHashNew(virHashValueFree);
+    g_autoptr(virHashTable) stats = virHashNew(g_free);
     bool blockdev = 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 51de72b5bf577a77163c4167f4ead303fc2e163d..69d81b20c29f9b71ca24bcb6dba9e70b4202d654 100644 (file)
--- 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 = virHashNew(virHashValueFree)))
+    if (!(*ret_stats = virHashNew(g_free)))
         goto error;
 
     ret = qemuMonitorJSONGetAllBlockStatsInfo(mon, *ret_stats,
@@ -4289,7 +4289,7 @@ qemuMonitorGetMemoryDeviceInfo(qemuMonitorPtr mon,
 
     QEMU_CHECK_MONITOR(mon);
 
-    if (!(*info = virHashNew(virHashValueFree)))
+    if (!(*info = virHashNew(g_free)))
         return -1;
 
     if ((ret = qemuMonitorJSONGetMemoryDeviceInfo(mon, *info)) < 0) {
@@ -4593,7 +4593,7 @@ qemuMonitorGetPRManagerInfo(qemuMonitorPtr mon,
 
     QEMU_CHECK_MONITOR(mon);
 
-    if (!(info = virHashNew(virHashValueFree)))
+    if (!(info = 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 91cc0c90461e4b20616f3793318b85822efd8092..2689ad50b9a33671527e8803c201adc3330bea45 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -5126,7 +5126,7 @@ qemuMonitorJSONGetAllBlockJobInfo(qemuMonitorPtr mon,
     }
 
     nr_results = virJSONValueArraySize(data);
-    if (!(blockJobs = virHashNew(virHashValueFree)))
+    if (!(blockJobs = virHashNew(g_free)))
         goto cleanup;
 
     for (i = 0; i < nr_results; i++) {

diff --git a/src/util/virhash.c b/src/util/virhash.c
index ce09f8f24828156f62280ccdec45b9b0509e4854..c781e1d5a58420efba92f06457dcac2955e35d90 100644 (file)
--- 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 b136455f1f58a151d480cda4cf082bc340f10f3c..2d221dce2564c7aa128c2e8de50943b3f550c081 100644 (file)
--- a/src/util/virhash.h
+++ b/src/util/virhash.h
@@ -202,7 +202,4 @@ ssize_t virHashRemoveSet(virHashTablePtr table, virHashSearcher 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 f50ecdeb3f21815e0ac8a33615b86a44a9098117..da7fd4625a0a5a3c58a29cd19ec88b717bf42c59 100644 (file)
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1649,8 +1649,8 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const void *opaque)
     if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema)))
         return -1;
 
-    if (!(blockDevices = virHashNew(virHashValueFree)) ||
-        !(expectedBlockDevices = virHashNew(virHashValueFree)))
+    if (!(blockDevices = virHashNew(g_free)) ||
+        !(expectedBlockDevices = virHashNew(g_free)))
         goto cleanup;
 
     info = g_new0(struct qemuDomainDiskInfo, 1);
@@ -1811,7 +1811,7 @@ testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo(const void *opaque)
     if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema)))
         return -1;
 
-    if (!(blockstats = virHashNew(virHashValueFree)))
+    if (!(blockstats = virHashNew(g_free)))
         goto cleanup;
 
     if (qemuMonitorTestAddItem(test, "query-blockstats", reply) < 0)

diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c
index c1344b3daa635df58e28c8a673738362a2ea234a..839be556653e68bc613a7439faf78f22e0d83958 100644 (file)
--- a/tests/qemusecuritymock.c
+++ b/tests/qemusecuritymock.c
@@ -85,12 +85,12 @@ init_hash(void)
     if (xattr_paths)
         return;
 
-    if (!(xattr_paths = virHashNew(virHashValueFree))) {
+    if (!(xattr_paths = virHashNew(g_free))) {
         fprintf(stderr, "Unable to create hash table for XATTR paths\n");
         abort();
     }
 
-    if (!(chown_paths = virHashNew(virHashValueFree))) {
+    if (!(chown_paths = 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 3f50d46d87475c8d5323093a327b43ef95e9ea61..4defba0b7b5d1ecbd2b9c028b40c6e99e7893be1 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -576,7 +576,7 @@ testQemuGetLatestCaps(void)
     virHashTablePtr capslatest;
     size_t i;
 
-    if (!(capslatest = virHashNew(virHashValueFree)))
+    if (!(capslatest = virHashNew(g_free)))
         goto error;
 
     VIR_TEST_VERBOSE("");