Switch away from virHashFree

Use 'g_clear_pointer(&ptr, g_hash_table_unref)' instead.

In few instances it allows us to also remove explicit clearing of
pointers.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index a06721c35d09e2839f3a517b27c71723f3c5f2f8..49745ba8818c87512c72e17fbff6f40882d874fc 100644 (file)
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -1377,7 +1377,7 @@ void virDomainCCWAddressSetFree(virDomainCCWAddressSet *addrs)
     if (!addrs)
         return;
 
-    virHashFree(addrs->defined);
+    g_clear_pointer(&addrs->defined, g_hash_table_unref);
     g_free(addrs);
 }
 

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 14aeda45731b9d4254930e6a79f1b96d16e873a1..bdcc3dc2c12f35951112d492620b2ca092a36cbd 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2640,7 +2640,7 @@ virDomainNetDefFree(virDomainNetDef *def)
     virDomainDeviceInfoClear(&def->info);
 
     g_free(def->filter);
-    virHashFree(def->filterparams);
+    g_clear_pointer(&def->filterparams, g_hash_table_unref);
 
     virNetDevBandwidthFree(def->bandwidth);
     virNetDevVlanClear(&def->vlan);

diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index a3109962afbf77cbd568ac69b304dd1d39b33165..3fedfdde56b6132405cdac68261e0a37747a6cb6 100644 (file)
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -323,7 +323,7 @@ virNWFilterIncludeDefFree(virNWFilterIncludeDef *inc)
 {
     if (!inc)
         return;
-    virHashFree(inc->params);
+    g_clear_pointer(&inc->params, g_hash_table_unref);
     g_free(inc->filterref);
     g_free(inc);
 }

diff --git a/src/conf/nwfilter_ipaddrmap.c b/src/conf/nwfilter_ipaddrmap.c
index bc21c8053649a0548446a0961a1abcda6b477d9f..e2f123b9d93dfaf6debfc19c2f1c40f6c145ed79 100644 (file)
--- a/src/conf/nwfilter_ipaddrmap.c
+++ b/src/conf/nwfilter_ipaddrmap.c
@@ -156,6 +156,5 @@ virNWFilterIPAddrMapInit(void)
 void
 virNWFilterIPAddrMapShutdown(void)
 {
-    virHashFree(ipAddressMap);
-    ipAddressMap = NULL;
+    g_clear_pointer(&ipAddressMap, g_hash_table_unref);
 }

diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c
index 5d6de684274e8bff3237f9d358f2a4caf1729dd2..b5477b03d503a75d30081b0374f82269ff0ec25d 100644 (file)
--- a/src/conf/virchrdev.c
+++ b/src/conf/virchrdev.c
@@ -295,7 +295,7 @@ void virChrdevFree(virChrdevs *devs)
 
     virMutexLock(&devs->lock);
     virHashForEachSafe(devs->hash, virChrdevFreeClearCallbacks, NULL);
-    virHashFree(devs->hash);
+    g_clear_pointer(&devs->hash, g_hash_table_unref);
     virMutexUnlock(&devs->lock);
     virMutexDestroy(&devs->lock);
 

diff --git a/src/conf/virdomainmomentobjlist.c b/src/conf/virdomainmomentobjlist.c
index 17b9c16ae700f64098f3dd06c34873c8844b0380..60f7eec106ef7b949c562f94886b70040c30e1a4 100644 (file)
--- a/src/conf/virdomainmomentobjlist.c
+++ b/src/conf/virdomainmomentobjlist.c
@@ -282,7 +282,7 @@ virDomainMomentObjListFree(virDomainMomentObjList *moments)
 {
     if (!moments)
         return;
-    virHashFree(moments->objs);
+    g_clear_pointer(&moments->objs, g_hash_table_unref);
     g_free(moments);
 }
 

diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c
index 063c63cd3070e535c40ef846979ab0fe3826720e..9be1e7ad7dc794691d0e3587fb3a83c1aa29f693 100644 (file)
--- a/src/conf/virdomainobjlist.c
+++ b/src/conf/virdomainobjlist.c
@@ -85,8 +85,8 @@ static void virDomainObjListDispose(void *obj)
 {
     virDomainObjList *doms = obj;
 
-    virHashFree(doms->objs);
-    virHashFree(doms->objsName);
+    g_clear_pointer(&doms->objs, g_hash_table_unref);
+    g_clear_pointer(&doms->objsName, g_hash_table_unref);
 }
 
 

diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c
index daac74e88c09372361c6507f9ad8809ab03addbe..9d75be6425f7630173f94aa7e0423113a815026f 100644 (file)
--- a/src/conf/virinterfaceobj.c
+++ b/src/conf/virinterfaceobj.c
@@ -345,7 +345,7 @@ virInterfaceObjListDispose(void *obj)
 {
     virInterfaceObjList *interfaces = obj;
 
-    virHashFree(interfaces->objsName);
+    g_clear_pointer(&interfaces->objsName, g_hash_table_unref);
 }
 
 

diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index f1baffc516481419b6cc907b67fe5e279102b4cc..41c7dcba5c06412d525391229f77e116f8e22483 100644 (file)
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -464,7 +464,7 @@ virNetworkObjDispose(void *opaque)
 {
     virNetworkObj *obj = opaque;
 
-    virHashFree(obj->ports);
+    g_clear_pointer(&obj->ports, g_hash_table_unref);
     virNetworkDefFree(obj->def);
     virNetworkDefFree(obj->newDef);
     virBitmapFree(obj->classIdMap);
@@ -477,7 +477,7 @@ virNetworkObjListDispose(void *opaque)
 {
     virNetworkObjList *nets = opaque;
 
-    virHashFree(nets->objs);
+    g_clear_pointer(&nets->objs, g_hash_table_unref);
 }
 
 

diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index 15898a6aa7a1553bc4c1c6403646575dfaa6fb10..2e4ef2df3c200788c659320038dc766bf50659e5 100644 (file)
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -453,7 +453,7 @@ virNodeDeviceObjListDispose(void *obj)
 {
     virNodeDeviceObjList *devs = obj;
 
-    virHashFree(devs->objs);
+    g_clear_pointer(&devs->objs, g_hash_table_unref);
 }
 
 

diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbindingdef.c
index 488fdbceabf36c2da42bd271e86fef81831c50b9..c55a5d28dcf25900b8975f2e997030a3b00400bb 100644 (file)
--- a/src/conf/virnwfilterbindingdef.c
+++ b/src/conf/virnwfilterbindingdef.c
@@ -40,7 +40,7 @@ virNWFilterBindingDefFree(virNWFilterBindingDef *def)
     g_free(def->portdevname);
     g_free(def->linkdevname);
     g_free(def->filter);
-    virHashFree(def->filterparams);
+    g_clear_pointer(&def->filterparams, g_hash_table_unref);
 
     g_free(def);
 }

diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c
index 212cca2265217589702353ca58822fb0f50a466c..03441c9c1bbcb33a510aa1075d71007fffc77824 100644 (file)
--- a/src/conf/virnwfilterbindingobjlist.c
+++ b/src/conf/virnwfilterbindingobjlist.c
@@ -77,7 +77,7 @@ virNWFilterBindingObjListDispose(void *obj)
 {
     virNWFilterBindingObjList *bindings = obj;
 
-    virHashFree(bindings->objs);
+    g_clear_pointer(&bindings->objs, g_hash_table_unref);
 }
 
 

diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c
index 3fbee6f6ec3607d6d4993e867761050a8d28adfd..a88f28fddafc4da23584bd8b972b2198c18067f5 100644 (file)
--- a/src/conf/virsecretobj.c
+++ b/src/conf/virsecretobj.c
@@ -149,7 +149,7 @@ virSecretObjListDispose(void *obj)
 {
     virSecretObjList *secrets = obj;
 
-    virHashFree(secrets->objs);
+    g_clear_pointer(&secrets->objs, g_hash_table_unref);
 }
 
 

diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 2c29339b6aec310766e732688f20071a2be43a5d..02903ac48799be047d2a837d916da83fbee41ff6 100644 (file)
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -183,9 +183,9 @@ virStorageVolObjListDispose(void *opaque)
 {
     virStorageVolObjList *vols = opaque;
 
-    virHashFree(vols->objsKey);
-    virHashFree(vols->objsName);
-    virHashFree(vols->objsPath);
+    g_clear_pointer(&vols->objsKey, g_hash_table_unref);
+    g_clear_pointer(&vols->objsName, g_hash_table_unref);
+    g_clear_pointer(&vols->objsPath, g_hash_table_unref);
 }
 
 
@@ -382,8 +382,8 @@ virStoragePoolObjListDispose(void *opaque)
 {
     virStoragePoolObjList *pools = opaque;
 
-    virHashFree(pools->objs);
-    virHashFree(pools->objsName);
+    g_clear_pointer(&pools->objs, g_hash_table_unref);
+    g_clear_pointer(&pools->objsName, g_hash_table_unref);
 }
 
 

diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index e211fd5d808d79127c13c26cb3f3b04e3b67ddbf..6712ef4835cd403e7e0fa4bbafd658614f8d8877 100644 (file)
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -357,7 +357,7 @@ hypervAddEmbeddedParam(hypervInvokeParamsList *params,
 void
 hypervFreeEmbeddedParam(GHashTable *p)
 {
-    virHashFree(p);
+    g_clear_pointer(&p, g_hash_table_unref);
 }
 
 

diff --git a/src/hypervisor/virclosecallbacks.c b/src/hypervisor/virclosecallbacks.c
index 2578a71f03d3fabb0661c7f24b41f2fd73d65e1f..84a61b002a3b02b4505c24bbce25db88892540d1 100644 (file)
--- a/src/hypervisor/virclosecallbacks.c
+++ b/src/hypervisor/virclosecallbacks.c
@@ -78,7 +78,7 @@ virCloseCallbacksDispose(void *obj)
 {
     virCloseCallbacks *closeCallbacks = obj;
 
-    virHashFree(closeCallbacks->list);
+    g_clear_pointer(&closeCallbacks->list, g_hash_table_unref);
 }
 
 int

diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c
index 46925781244730f466374601ec6c425d136e36f6..d176c2a7c27469426a202a7f74ffe44d7d3c1739 100644 (file)
--- a/src/libxl/libxl_logger.c
+++ b/src/libxl/libxl_logger.c
@@ -166,7 +166,7 @@ libxlLoggerFree(libxlLogger *logger)
     xentoollog_logger *xtl_logger = (xentoollog_logger*)logger;
     if (logger->defaultLogFile)
         VIR_FORCE_FCLOSE(logger->defaultLogFile);
-    virHashFree(logger->files);
+    g_clear_pointer(&logger->files, g_hash_table_unref);
     xtl_logger_destroy(xtl_logger);
 }
 

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index faca4a2485694045087e834172c92d77bc297758..cf33d9732b0574c6444042345bd410ba4029253c 100644 (file)
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -89,7 +89,7 @@ virLockDaemonFree(virLockDaemon *lockd)
 
     g_mutex_clear(&lockd->lock);
     virObjectUnref(lockd->dmn);
-    virHashFree(lockd->lockspaces);
+    g_clear_pointer(&lockd->lockspaces, g_hash_table_unref);
     virLockSpaceFree(lockd->defaultLockspace);
 
     g_free(lockd);

diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index b0297f0741ebceaf91f5ae2da7b428f81a50c5e9..386e7640c2efb5eb30bc533d2a5eb15be3863a66 100644 (file)
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -2080,13 +2080,13 @@ virNWFilterDHCPSnoopShutdown(void)
     virNWFilterSnoopLock();
 
     virNWFilterSnoopLeaseFileClose();
-    virHashFree(virNWFilterSnoopState.ifnameToKey);
-    virHashFree(virNWFilterSnoopState.snoopReqs);
+    g_clear_pointer(&virNWFilterSnoopState.ifnameToKey, g_hash_table_unref);
+    g_clear_pointer(&virNWFilterSnoopState.snoopReqs, g_hash_table_unref);
 
     virNWFilterSnoopUnlock();
 
     virNWFilterSnoopActiveLock();
-    virHashFree(virNWFilterSnoopState.active);
+    g_clear_pointer(&virNWFilterSnoopState.active, g_hash_table_unref);
     virNWFilterSnoopActiveUnlock();
 }
 

diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c
index ea1f4f409257f613f079a9f3bf34282eb33d8ee0..20ecd299bfe78640abb042a07198f8725026c0e7 100644 (file)
--- a/src/nwfilter/nwfilter_gentech_driver.c
+++ b/src/nwfilter/nwfilter_gentech_driver.c
@@ -121,7 +121,7 @@ virNWFilterRuleInstFree(virNWFilterRuleInst *inst)
     if (!inst)
         return;
 
-    virHashFree(inst->vars);
+    g_clear_pointer(&inst->vars, g_hash_table_unref);
     g_free(inst);
 }
 

diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c
index 2177c5540b65bdbc4adaff29edd616e7da74fe6e..fb552bd1e60edf64dfd5c08c5e4b516db1d227d5 100644 (file)
--- a/src/nwfilter/nwfilter_learnipaddr.c
+++ b/src/nwfilter/nwfilter_learnipaddr.c
@@ -805,9 +805,6 @@ virNWFilterLearnShutdown(void)
 
     virNWFilterLearnThreadsTerminate(false);
 
-    virHashFree(pendingLearnReq);
-    pendingLearnReq = NULL;
-
-    virHashFree(ifaceLockMap);
-    ifaceLockMap = NULL;
+    g_clear_pointer(&pendingLearnReq, g_hash_table_unref);
+    g_clear_pointer(&ifaceLockMap, g_hash_table_unref);
 }

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 3207d4c621e92491c4acd4c5c44a1b95feda977a..2c10f185f86c4e3e49cb3e0b71ec949aa03924e3 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1701,7 +1701,7 @@ qemuDomainObjPrivateFree(void *data)
     g_clear_pointer(&priv->migSecinfo, qemuDomainSecretInfoFree);
     qemuDomainMasterKeyFree(priv);
 
-    virHashFree(priv->blockjobs);
+    g_clear_pointer(&priv->blockjobs, g_hash_table_unref);
 
     /* This should never be non-NULL if we get here, but just in case... */
     if (priv->eventThread) {

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 74b540ad91838f3da8e90e16b1791eb3b559ef3d..b88fb470323a0b16448c321d67612c7b6394c691 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1084,7 +1084,7 @@ qemuStateCleanup(void)
     virPortAllocatorRangeFree(qemu_driver->migrationPorts);
     virPortAllocatorRangeFree(qemu_driver->webSocketPorts);
     virPortAllocatorRangeFree(qemu_driver->remotePorts);
-    virHashFree(qemu_driver->sharedDevices);
+    g_clear_pointer(&qemu_driver->sharedDevices, g_hash_table_unref);
     virObjectUnref(qemu_driver->hostdevMgr);
     virObjectUnref(qemu_driver->securityManager);
     virObjectUnref(qemu_driver->domainEventState);

diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
index 444fe3dbe7238d576da9e49893c906836670c167..c946e4a92a8bd8f4334ef59d2f7261e86142af20 100644 (file)
--- a/src/rpc/virnetdaemon.c
+++ b/src/rpc/virnetdaemon.c
@@ -110,7 +110,7 @@ virNetDaemonDispose(void *obj)
     VIR_FORCE_CLOSE(dmn->autoShutdownInhibitFd);
     g_free(dmn->stateStopThread);
 
-    virHashFree(dmn->servers);
+    g_clear_pointer(&dmn->servers, g_hash_table_unref);
 
     virJSONValueFree(dmn->srvObject);
 }

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 5682d2bb9daea1c1013132201c2838f4edb85a81..09524310648b76a348d4ac677a02950e0e869478 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -692,7 +692,7 @@ virSecuritySELinuxLXCInitialize(virSecurityManager *mgr)
     VIR_FREE(data->domain_context);
     VIR_FREE(data->file_context);
     VIR_FREE(data->content_context);
-    virHashFree(data->mcs);
+    g_clear_pointer(&data->mcs, g_hash_table_unref);
     return -1;
 }
 
@@ -764,7 +764,7 @@ virSecuritySELinuxQEMUInitialize(virSecurityManager *mgr)
     VIR_FREE(data->alt_domain_context);
     VIR_FREE(data->file_context);
     VIR_FREE(data->content_context);
-    virHashFree(data->mcs);
+    g_clear_pointer(&data->mcs, g_hash_table_unref);
     return -1;
 }
 
@@ -1030,7 +1030,7 @@ virSecuritySELinuxDriverClose(virSecurityManager *mgr)
     if (data->label_handle)
         selabel_close(data->label_handle);
 
-    virHashFree(data->mcs);
+    g_clear_pointer(&data->mcs, g_hash_table_unref);
 
     VIR_FREE(data->domain_context);
     VIR_FREE(data->alt_domain_context);

diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c
index 64348dc1e6ba75963a6e0fc61cd4e3a6d7971bc0..c140f9d5eaab820e4a3991e488c7b7f1d99b3008 100644 (file)
--- a/src/util/virfilecache.c
+++ b/src/util/virfilecache.c
@@ -77,7 +77,7 @@ virFileCacheDispose(void *obj)
     g_free(cache->dir);
     g_free(cache->suffix);
 
-    virHashFree(cache->table);
+    g_clear_pointer(&cache->table, g_hash_table_unref);
 
     virFileCachePrivFree(cache);
 }

diff --git a/src/util/virhash.c b/src/util/virhash.c
index a9996c9fc0c14eb8460f2dc9d7077970cae0646e..cc6053f28d6e92ad69d86296094013973234ae75 100644 (file)
--- a/src/util/virhash.c
+++ b/src/util/virhash.c
@@ -112,7 +112,7 @@ virHashAtomicDispose(void *obj)
 {
     virHashAtomic *hash = obj;
 
-    virHashFree(hash->hash);
+    g_clear_pointer(&hash->hash, g_hash_table_unref);
 }
 
 

diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index 46bd922f35eb470ca4e28ef08384d6abecc31ca6..a7f1c2324f67547ecda7204ef096a71fdd08b3d4 100644 (file)
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -477,7 +477,7 @@ void virLockSpaceFree(virLockSpace *lockspace)
     if (!lockspace)
         return;
 
-    virHashFree(lockspace->resources);
+    g_clear_pointer(&lockspace->resources, g_hash_table_unref);
     g_free(lockspace->dir);
     virMutexDestroy(&lockspace->lock);
     g_free(lockspace);

diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c
index fb16062cd18a685ab844ef8e6c14eab642237bdb..0b7b758c6d7f5150eadd05a76b96c2c408c47c4a 100644 (file)
--- a/src/util/virmacmap.c
+++ b/src/util/virmacmap.c
@@ -62,7 +62,7 @@ virMacMapDispose(void *obj)
     while (g_hash_table_iter_next(&htitr, NULL, &value))
         g_slist_free_full(value, g_free);
 
-    virHashFree(mgr->macs);
+    g_clear_pointer(&mgr->macs, g_hash_table_unref);
 }
 
 

diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c
index 99c92b6f5264c8d0845126c07ba71ef3fd715843..a86d4c6bb905332d98d6ad1494515217752f4ab4 100644 (file)
--- a/src/util/virsystemd.c
+++ b/src/util/virsystemd.c
@@ -1108,7 +1108,7 @@ virSystemdActivationFree(virSystemdActivation *act)
     if (!act)
         return;
 
-    virHashFree(act->fds);
+    g_clear_pointer(&act->fds, g_hash_table_unref);
 
     g_free(act);
 }

diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c
index 315afddca0e427bac38726905eb523d638f00eea..857214dde54c35e471974cd6a384e1e6264155eb 100644 (file)
--- a/tests/nwfilterxml2firewalltest.c
+++ b/tests/nwfilterxml2firewalltest.c
@@ -166,7 +166,7 @@ virNWFilterRuleInstFree(virNWFilterRuleInst *inst)
     if (!inst)
         return;
 
-    virHashFree(inst->vars);
+    g_clear_pointer(&inst->vars, g_hash_table_unref);
     g_free(inst);
 }
 

diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c
index f092383b6252c55c74bc0efee66efe60fbd984f1..778b0561ac7cbf3c18440609f7c13ab9031b6515 100644 (file)
--- a/tests/qemusecuritymock.c
+++ b/tests/qemusecuritymock.c
@@ -502,10 +502,9 @@ void freePaths(void)
     virMutexLock(&m);
     init_hash();
 
-    virHashFree(selinux_paths);
-    virHashFree(chown_paths);
-    virHashFree(xattr_paths);
-    selinux_paths = chown_paths = xattr_paths = NULL;
+    g_clear_pointer(&selinux_paths, g_hash_table_unref);
+    g_clear_pointer(&chown_paths, g_hash_table_unref);
+    g_clear_pointer(&xattr_paths, g_hash_table_unref);
     virMutexUnlock(&m);
 }