Replace all instances of 'virHashCreate' with 'virHashNew'

It doesn't make much sense to configure the bucket count in the hash
table for each case specifically. Replace all calls of virHashCreate
with virHashNew which has a pre-set size and remove virHashCreate
completely.

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 4e47c2547c08fc9cf96e7e1b00810eaa26c87bf8..de344186ec570d01516a8f048ce89dc1ad18e0c6 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 = virHashCreate(10, virHashValueFree)))
+    if (!(addrs->defined = virHashNew(virHashValueFree)))
         goto error;
 
     /* must use cssid = 0xfe (254) for virtio-ccw devices */

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 37efd104f17e4d630192a8bd9a5fca053ff9ad1d..f4f017cf83d5439337c2023b190eff143b77318d 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5821,7 +5821,7 @@ virDomainDefBootOrderPostParse(virDomainDefPtr def)
     virHashTablePtr bootHash = NULL;
     int ret = -1;
 
-    if (!(bootHash = virHashCreate(5, NULL)))
+    if (!(bootHash = virHashNew(NULL)))
         goto cleanup;
 
     if (virDomainDeviceInfoIterate(def, virDomainDefCollectBootOrder, bootHash) < 0)
@@ -6927,7 +6927,7 @@ virDomainDefValidateAliases(const virDomainDef *def,
     int ret = -1;
 
     /* We are not storing copies of aliases. Don't free them. */
-    if (!(data.aliases = virHashCreate(10, NULL)))
+    if (!(data.aliases = virHashNew(NULL)))
         goto cleanup;
 
     if (virDomainDeviceInfoIterateInternal((virDomainDefPtr) def,

diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c
index c50f9ca7203d1c82c4316819d7355e442da0e4a5..0d2c9503ab1216f34e2b7c6ae5ccb547d3cbdafb 100644 (file)
--- a/src/conf/virchrdev.c
+++ b/src/conf/virchrdev.c
@@ -266,7 +266,7 @@ virChrdevsPtr virChrdevAlloc(void)
 
     /* there will hardly be any devices most of the time, the hash
      * does not have to be huge */
-    if (!(devs->hash = virHashCreate(3, virChrdevHashEntryFree)))
+    if (!(devs->hash = virHashNew(virChrdevHashEntryFree)))
         goto error;
 
     return devs;

diff --git a/src/conf/virdomainmomentobjlist.c b/src/conf/virdomainmomentobjlist.c
index 8a1eb6b7341cde3d84c3c7babc23faaadd97787c..43c77e6c54fa14688596a0915efec5da93af3b84 100644 (file)
--- a/src/conf/virdomainmomentobjlist.c
+++ b/src/conf/virdomainmomentobjlist.c
@@ -275,7 +275,7 @@ virDomainMomentObjListNew(void)
     virDomainMomentObjListPtr moments;
 
     moments = g_new0(virDomainMomentObjList, 1);
-    moments->objs = virHashCreate(50, virDomainMomentObjListDataFree);
+    moments->objs = virHashNew(virDomainMomentObjListDataFree);
     if (!moments->objs) {
         VIR_FREE(moments);
         return NULL;

diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c
index 46b28cc9a67614eebde6f0222a4c5f8b2502ccc7..9e8757eff993ad78c7be2748df4ade7df30b98d2 100644 (file)
--- a/src/conf/virdomainobjlist.c
+++ b/src/conf/virdomainobjlist.c
@@ -75,8 +75,8 @@ virDomainObjListPtr virDomainObjListNew(void)
     if (!(doms = virObjectRWLockableNew(virDomainObjListClass)))
         return NULL;
 
-    if (!(doms->objs = virHashCreate(50, virObjectFreeHashData)) ||
-        !(doms->objsName = virHashCreate(50, virObjectFreeHashData))) {
+    if (!(doms->objs = virHashNew(virObjectFreeHashData)) ||
+        !(doms->objsName = virHashNew(virObjectFreeHashData))) {
         virObjectUnref(doms);
         return NULL;
     }

diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c
index e08b4b9b0fd9da43e7f1ab311838afd86df60ac4..1e29e12148084d12610d382d7e1b9383d23bee06 100644 (file)
--- a/src/conf/virinterfaceobj.c
+++ b/src/conf/virinterfaceobj.c
@@ -142,7 +142,7 @@ virInterfaceObjListNew(void)
     if (!(interfaces = virObjectRWLockableNew(virInterfaceObjListClass)))
         return NULL;
 
-    if (!(interfaces->objsName = virHashCreate(10, virObjectFreeHashData))) {
+    if (!(interfaces->objsName = virHashNew(virObjectFreeHashData))) {
         virObjectUnref(interfaces);
         return NULL;
     }

diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index a2835ebf8e82defe99635dc96022dc6512e98528..3e537e512e664b579460b32248ff1776914ad01b 100644 (file)
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -118,8 +118,7 @@ virNetworkObjNew(void)
         virBitmapSetBitExpand(obj->classIdMap, 2) < 0)
         goto error;
 
-    if (!(obj->ports = virHashCreate(10,
-                                     virNetworkObjPortFree)))
+    if (!(obj->ports = virHashNew(virNetworkObjPortFree)))
         goto error;
 
     virObjectLock(obj);
@@ -351,7 +350,7 @@ virNetworkObjListNew(void)
     if (!(nets = virObjectRWLockableNew(virNetworkObjListClass)))
         return NULL;
 
-    if (!(nets->objs = virHashCreate(50, virObjectFreeHashData))) {
+    if (!(nets->objs = virHashNew(virObjectFreeHashData))) {
         virObjectUnref(nets);
         return NULL;
     }

diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index 9af80b803663c79bd98c7686a202ddf0353d36fd..dcac4c36bbff2bf05f3695cbb6833708de2e49e5 100644 (file)
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -454,7 +454,7 @@ virNodeDeviceObjListNew(void)
     if (!(devs = virObjectRWLockableNew(virNodeDeviceObjListClass)))
         return NULL;
 
-    if (!(devs->objs = virHashCreate(50, virObjectFreeHashData))) {
+    if (!(devs->objs = virHashNew(virObjectFreeHashData))) {
         virObjectUnref(devs);
         return NULL;
     }

diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c
index 328b1b8482909b1cf00123a163fbbfdefda88f65..6f4ad0bae6b049fd0b29a016d9718e52edb10e52 100644 (file)
--- a/src/conf/virnwfilterbindingobjlist.c
+++ b/src/conf/virnwfilterbindingobjlist.c
@@ -66,7 +66,7 @@ virNWFilterBindingObjListNew(void)
     if (!(bindings = virObjectRWLockableNew(virNWFilterBindingObjListClass)))
         return NULL;
 
-    if (!(bindings->objs = virHashCreate(50, virObjectFreeHashData))) {
+    if (!(bindings->objs = virHashNew(virObjectFreeHashData))) {
         virObjectUnref(bindings);
         return NULL;
     }

diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c
index d74deb93166ab59850bcd6be258cda1137d85755..a3ae64ec53264890e043122143d9779a15bf5d8f 100644 (file)
--- a/src/conf/virsecretobj.c
+++ b/src/conf/virsecretobj.c
@@ -119,7 +119,7 @@ virSecretObjListNew(void)
     if (!(secrets = virObjectRWLockableNew(virSecretObjListClass)))
         return NULL;
 
-    if (!(secrets->objs = virHashCreate(50, virObjectFreeHashData))) {
+    if (!(secrets->objs = virHashNew(virObjectFreeHashData))) {
         virObjectUnref(secrets);
         return NULL;
     }

diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 1c7d615a7aa1184f8edc21146694c3bccf5e5159..1edcc3e0742728009e69a891ce613744ac5e40f8 100644 (file)
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -172,9 +172,9 @@ virStorageVolObjListNew(void)
     if (!(vols = virObjectRWLockableNew(virStorageVolObjListClass)))
         return NULL;
 
-    if (!(vols->objsKey = virHashCreate(10, virObjectFreeHashData)) ||
-        !(vols->objsName = virHashCreate(10, virObjectFreeHashData)) ||
-        !(vols->objsPath = virHashCreate(10, virObjectFreeHashData))) {
+    if (!(vols->objsKey = virHashNew(virObjectFreeHashData)) ||
+        !(vols->objsName = virHashNew(virObjectFreeHashData)) ||
+        !(vols->objsPath = virHashNew(virObjectFreeHashData))) {
         virObjectUnref(vols);
         return NULL;
     }
@@ -404,8 +404,8 @@ virStoragePoolObjListNew(void)
     if (!(pools = virObjectRWLockableNew(virStoragePoolObjListClass)))
         return NULL;
 
-    if (!(pools->objs = virHashCreate(20, virObjectFreeHashData)) ||
-        !(pools->objsName = virHashCreate(20, virObjectFreeHashData))) {
+    if (!(pools->objs = virHashNew(virObjectFreeHashData)) ||
+        !(pools->objsName = virHashNew(virObjectFreeHashData))) {
         virObjectUnref(pools);
         return NULL;
     }

diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index 29447b8f0ff3ea926fa2f62e70b3d63598c8e1fe..f2fb7faeb0633afd1f0118f42f2fb8d12f5dd180 100644 (file)
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -332,7 +332,7 @@ hypervCreateEmbeddedParam(hypervPrivate *priv, hypervWmiClassInfoListPtr info)
     for (count = 0; typeinfo[count].name != NULL; count++)
         ;
 
-    table = virHashCreate(count, NULL);
+    table = virHashNew(NULL);
     if (table == NULL)
         return NULL;
 

diff --git a/src/hypervisor/virclosecallbacks.c b/src/hypervisor/virclosecallbacks.c
index 403af047fb5db6c7d7e34c1f756b6835cf9621d2..176dd5c2635397d963509ddde101a127140f9e61 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 = virHashCreate(5, virHashValueFree);
+    closeCallbacks->list = virHashNew(virHashValueFree);
     if (!closeCallbacks->list) {
         virObjectUnref(closeCallbacks);
         return NULL;

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 4f9e7f6048055f9fe2c986e0d0c892a3d5745f84..36e2c66d93949fc0277a221e73331c8f19d9df37 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2199,7 +2199,6 @@ virHashAddEntry;
 virHashAtomicNew;
 virHashAtomicSteal;
 virHashAtomicUpdate;
-virHashCreate;
 virHashEqual;
 virHashForEach;
 virHashFree;

diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c
index 379d7a8d00df687aa41281484d8041e459d31c38..d0ce899fe85bd4d0dec13fb5fb7f44b1d34151d0 100644 (file)
--- a/src/libxl/libxl_logger.c
+++ b/src/libxl/libxl_logger.c
@@ -153,7 +153,7 @@ libxlLoggerNew(const char *logDir, virLogPriority minLevel)
     }
     logger.logDir = logDir;
 
-    if ((logger.files = virHashCreate(3, libxlLoggerFileFree)) == NULL)
+    if ((logger.files = virHashNew(libxlLoggerFileFree)) == NULL)
         return NULL;
 
     path = g_strdup_printf("%s/libxl-driver.log", logDir);

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 88fa7b795785b0cc71bd53c2c706ffdc66b4debd..f1dabe56cd2bf5370d85dbea1b1436359b6eaf7a 100644 (file)
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -56,8 +56,6 @@
 
 VIR_LOG_INIT("locking.lock_daemon");
 
-#define VIR_LOCK_DAEMON_NUM_LOCKSPACES 3
-
 struct _virLockDaemon {
     GMutex lock;
     virNetDaemonPtr dmn;
@@ -155,8 +153,7 @@ virLockDaemonNew(virLockDaemonConfigPtr config, bool privileged)
     virObjectUnref(srv);
     srv = NULL;
 
-    if (!(lockd->lockspaces = virHashCreate(VIR_LOCK_DAEMON_NUM_LOCKSPACES,
-                                            virLockDaemonLockSpaceDataFree)))
+    if (!(lockd->lockspaces = virHashNew(virLockDaemonLockSpaceDataFree)))
         goto error;
 
     if (!(lockd->defaultLockspace = virLockSpaceNew(NULL)))
@@ -215,8 +212,7 @@ virLockDaemonNewPostExecRestart(virJSONValuePtr object, bool privileged)
 
     g_mutex_init(&lockd->lock);
 
-    if (!(lockd->lockspaces = virHashCreate(VIR_LOCK_DAEMON_NUM_LOCKSPACES,
-                                            virLockDaemonLockSpaceDataFree)))
+    if (!(lockd->lockspaces = virHashNew(virLockDaemonLockSpaceDataFree)))
         goto error;
 
     if (!(child = virJSONValueObjectGet(object, "defaultLockspace"))) {

diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index d0992b782c85c5a755384bbc16f089307221f9b3..a9cbaccdad5af3fd7aa2822fe0680370d1d2b347 100644 (file)
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -2005,10 +2005,10 @@ virNWFilterDHCPSnoopInit(void)
         virMutexInit(&virNWFilterSnoopState.activeLock) < 0)
         return -1;
 
-    virNWFilterSnoopState.ifnameToKey = virHashCreate(0, NULL);
-    virNWFilterSnoopState.active = virHashCreate(0, NULL);
+    virNWFilterSnoopState.ifnameToKey = virHashNew(NULL);
+    virNWFilterSnoopState.active = virHashNew(NULL);
     virNWFilterSnoopState.snoopReqs =
-        virHashCreate(0, virNWFilterSnoopReqRelease);
+        virHashNew(virNWFilterSnoopReqRelease);
 
     if (!virNWFilterSnoopState.ifnameToKey ||
         !virNWFilterSnoopState.snoopReqs ||

diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c
index e73aa82eb4e3304177776bf3f51942f89001eedd..da6f88f13596da6d1eac53e43ae54f78fdcbe37d 100644 (file)
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -3323,8 +3323,8 @@ ebiptablesApplyNewRules(const char *ifname,
 {
     size_t i, j;
     g_autoptr(virFirewall) fw = virFirewallNew();
-    g_autoptr(virHashTable) chains_in_set  = virHashCreate(10, NULL);
-    g_autoptr(virHashTable) chains_out_set = virHashCreate(10, NULL);
+    g_autoptr(virHashTable) chains_in_set  = virHashNew(NULL);
+    g_autoptr(virHashTable) chains_out_set = virHashNew(NULL);
     bool haveEbtables = false;
     bool haveIptables = false;
     bool haveIp6tables = false;

diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c
index 99d2c0fce49afb97975a90c2a74c626105fc881a..073c91550abb22157e3fdaf3469adb46e3903843 100644 (file)
--- a/src/nwfilter/nwfilter_gentech_driver.c
+++ b/src/nwfilter/nwfilter_gentech_driver.c
@@ -1008,7 +1008,7 @@ virNWFilterBuildAll(virNWFilterDriverStatePtr driver,
     VIR_DEBUG("Build all filters newFilters=%d", newFilters);
 
     if (newFilters) {
-        if (!(data.skipInterfaces = virHashCreate(0, NULL)))
+        if (!(data.skipInterfaces = virHashNew(NULL)))
             return -1;
 
         data.step = STEP_APPLY_NEW;

diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c
index faf66ac84aff8ed854519a32b218554987b8c21c..82797d9a6408fec22bbaf590b7c51cab6bb56f45 100644 (file)
--- a/src/nwfilter/nwfilter_learnipaddr.c
+++ b/src/nwfilter/nwfilter_learnipaddr.c
@@ -777,11 +777,11 @@ virNWFilterLearnInit(void)
     VIR_DEBUG("Initializing IP address learning");
     threadsTerminate = false;
 
-    pendingLearnReq = virHashCreate(0, freeLearnReqEntry);
+    pendingLearnReq = virHashNew(freeLearnReqEntry);
     if (!pendingLearnReq)
         return -1;
 
-    ifaceLockMap = virHashCreate(0, virHashValueFree);
+    ifaceLockMap = virHashNew(virHashValueFree);
     if (!ifaceLockMap) {
         virNWFilterLearnShutdown();
         return -1;

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index f1cd12a95041217072f157362789870a671d2610..0c2710a7c6c11f4f27d2be4f54d9f7e981904776 100644 (file)
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -234,7 +234,7 @@ qemuBlockNodeNameGetBackingChain(virJSONValuePtr namednodes,
 
     memset(&data, 0, sizeof(data));
 
-    if (!(namednodestable = virHashCreate(50, virJSONValueHashFree)))
+    if (!(namednodestable = virHashNew(virJSONValueHashFree)))
         return NULL;
 
     if (virJSONValueArrayForeachSteal(namednodes,
@@ -242,7 +242,7 @@ qemuBlockNodeNameGetBackingChain(virJSONValuePtr namednodes,
                                       namednodestable) < 0)
         return NULL;
 
-    if (!(disks = virHashCreate(50, qemuBlockNodeNameBackingChainDataHashEntryFree)))
+    if (!(disks = virHashNew(qemuBlockNodeNameBackingChainDataHashEntryFree)))
         return NULL;
 
     data.nodenamestable = namednodestable;
@@ -370,7 +370,7 @@ qemuBlockGetNodeData(virJSONValuePtr data)
 {
     g_autoptr(virHashTable) nodedata = NULL;
 
-    if (!(nodedata = virHashCreate(50, virJSONValueHashFree)))
+    if (!(nodedata = virHashNew(virJSONValueHashFree)))
         return NULL;
 
     if (virJSONValueArrayForeachSteal(data,

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 9435333a0e40fee7e54214a7243b7c75f646a9c4..2249d035fb67a64810327510aafa9413231f40f0 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1784,7 +1784,7 @@ virQEMUDomainCapsCacheNew(void)
     if (!(cache = virObjectLockableNew(virQEMUDomainCapsCacheClass)))
         return NULL;
 
-    if (!(cache->cache = virHashCreate(5, virObjectFreeHashData)))
+    if (!(cache->cache = virHashNew(virObjectFreeHashData)))
         return NULL;
 
     return g_steal_pointer(&cache);
@@ -3114,7 +3114,7 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
         qemuMonitorCPUPropertyPtr nmProp;
         size_t i;
 
-        if (!(hash = virHashCreate(0, NULL)))
+        if (!(hash = virHashNew(NULL)))
             goto cleanup;
 
         for (i = 0; i < modelInfo->nprops; i++) {

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index faf892fba3f4547d93647176c985ca34bb113939..f1191c1210689533e67e2ad7b4120c5c09475310 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -787,7 +787,7 @@ qemuStateInitialize(bool privileged,
     if (!(qemu_driver->hostdevMgr = virHostdevManagerGetDefault()))
         goto error;
 
-    if (!(qemu_driver->sharedDevices = virHashCreate(30, qemuSharedDeviceEntryFree)))
+    if (!(qemu_driver->sharedDevices = virHashNew(qemuSharedDeviceEntryFree)))
         goto error;
 
     if (qemuMigrationDstErrorInit(qemu_driver) < 0)

diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c
index 975cbf0afda30c44a74fc0269d23f229c6ec3d65..080674ce2ddce5afaba6a52501dcbdc35570a135 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 = virHashCreate(10, virHashValueFree)))
+    if (!(files = virHashNew(virHashValueFree)))
         return -1;
 
     if (qemuBuildFileList(files, sysLocation) < 0)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index b66d278ee5732ea359865087c9ed3e9311f2dcfc..51de72b5bf577a77163c4167f4ead303fc2e163d 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2086,7 +2086,7 @@ qemuMonitorGetBlockInfo(qemuMonitorPtr mon)
 
     QEMU_CHECK_MONITOR_NULL(mon);
 
-    if (!(table = virHashCreate(32, qemuDomainDiskInfoFree)))
+    if (!(table = virHashNew(qemuDomainDiskInfoFree)))
         return NULL;
 
     ret = qemuMonitorJSONGetBlockInfo(mon, table);
@@ -2137,7 +2137,7 @@ qemuMonitorGetAllBlockStatsInfo(qemuMonitorPtr mon,
 
     QEMU_CHECK_MONITOR(mon);
 
-    if (!(*ret_stats = virHashCreate(10, virHashValueFree)))
+    if (!(*ret_stats = virHashNew(virHashValueFree)))
         goto error;
 
     ret = qemuMonitorJSONGetAllBlockStatsInfo(mon, *ret_stats,
@@ -2878,7 +2878,7 @@ qemuMonitorGetChardevInfo(qemuMonitorPtr mon,
 
     QEMU_CHECK_MONITOR_GOTO(mon, error);
 
-    if (!(info = virHashCreate(10, qemuMonitorChardevInfoFree)))
+    if (!(info = virHashNew(qemuMonitorChardevInfoFree)))
         goto error;
 
     ret = qemuMonitorJSONGetChardevInfo(mon, info);
@@ -4289,7 +4289,7 @@ qemuMonitorGetMemoryDeviceInfo(qemuMonitorPtr mon,
 
     QEMU_CHECK_MONITOR(mon);
 
-    if (!(*info = virHashCreate(10, virHashValueFree)))
+    if (!(*info = virHashNew(virHashValueFree)))
         return -1;
 
     if ((ret = qemuMonitorJSONGetMemoryDeviceInfo(mon, *info)) < 0) {
@@ -4593,7 +4593,7 @@ qemuMonitorGetPRManagerInfo(qemuMonitorPtr mon,
 
     QEMU_CHECK_MONITOR(mon);
 
-    if (!(info = virHashCreate(10, virHashValueFree)))
+    if (!(info = virHashNew(virHashValueFree)))
         goto cleanup;
 
     if (qemuMonitorJSONGetPRManagerInfo(mon, info) < 0)

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 6c763ecc12cf64e55e8a7cdcf9494b061603c7bd..91cc0c90461e4b20616f3793318b85822efd8092 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 = virHashCreate(nr_results, virHashValueFree)))
+    if (!(blockJobs = virHashNew(virHashValueFree)))
         goto cleanup;
 
     for (i = 0; i < nr_results; i++) {

diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c
index 43f367f2a22fce7ef58d85629e3be2f3938060db..5e5fff3019f4bd2145cb0cde5ef70a3f47be4d19 100644 (file)
--- a/src/qemu/qemu_qapi.c
+++ b/src/qemu/qemu_qapi.c
@@ -517,7 +517,7 @@ virQEMUQAPISchemaConvert(virJSONValuePtr schemareply)
     g_autoptr(virHashTable) schema = NULL;
     g_autoptr(virJSONValue) schemajson = schemareply;
 
-    if (!(schema = virHashCreate(512, virJSONValueHashFree)))
+    if (!(schema = virHashNew(virJSONValueHashFree)))
         return NULL;
 
     if (virJSONValueArrayForeachSteal(schemajson,

diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
index 37a5662e04575d68921ea622e084798e17ee705a..3e2af53e82863c5efd820abb70709849f5fb1f0d 100644 (file)
--- a/src/rpc/virnetdaemon.c
+++ b/src/rpc/virnetdaemon.c
@@ -140,7 +140,7 @@ virNetDaemonNew(void)
     if (!(dmn = virObjectLockableNew(virNetDaemonClass)))
         return NULL;
 
-    if (!(dmn->servers = virHashCreate(5, virObjectFreeHashData)))
+    if (!(dmn->servers = virHashNew(virObjectFreeHashData)))
         goto error;
 
 #ifndef WIN32

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index e40d670e97c8e1876388f338069e887952859a44..733bcf23d9751189424c392f6e9341d890b3141e 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -685,7 +685,7 @@ virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr)
         goto error;
     }
 
-    if (!(data->mcs = virHashCreate(10, NULL)))
+    if (!(data->mcs = virHashNew(NULL)))
         goto error;
 
     return 0;
@@ -757,7 +757,7 @@ virSecuritySELinuxQEMUInitialize(virSecurityManagerPtr mgr)
     VIR_DEBUG("Loaded file context '%s', content context '%s'",
               data->file_context, data->content_context);
 
-    if (!(data->mcs = virHashCreate(10, NULL)))
+    if (!(data->mcs = virHashNew(NULL)))
         goto error;
 
     return 0;

diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c
index 195587e6bd12824f3e9056be6c6bf4b7cfd836d3..6d75e2e4fb179c0271a25e5cfc67612b3d0075a7 100644 (file)
--- a/src/util/virfilecache.c
+++ b/src/util/virfilecache.c
@@ -242,7 +242,7 @@ virFileCacheNew(const char *dir,
     if (!(cache = virObjectNew(virFileCacheClass)))
         return NULL;
 
-    if (!(cache->table = virHashCreate(10, virObjectFreeHashData)))
+    if (!(cache->table = virHashNew(virObjectFreeHashData)))
         goto cleanup;
 
     cache->dir = g_strdup(dir);

diff --git a/src/util/virhash.c b/src/util/virhash.c
index 23e12e02559ea2241d89133b53a7cc8ce639ac93..ce09f8f24828156f62280ccdec45b9b0509e4854 100644 (file)
--- a/src/util/virhash.c
+++ b/src/util/virhash.c
@@ -190,27 +190,6 @@ virHashNew(virHashDataFree dataFree)
 }
 
 
-/**
- * virHashCreate:
- * @size: the size of the hash table
- * @dataFree: callback to free data
- *
- * Create a new virHashTablePtr.
- *
- * Returns the newly created object.
- */
-virHashTablePtr virHashCreate(ssize_t size, virHashDataFree dataFree)
-{
-    return virHashCreateFull(size,
-                             dataFree,
-                             virHashStrCode,
-                             virHashStrEqual,
-                             virHashStrCopy,
-                             virHashStrPrintHuman,
-                             virHashStrFree);
-}
-
-
 virHashAtomicPtr
 virHashAtomicNew(virHashDataFree dataFree)
 {

diff --git a/src/util/virhash.h b/src/util/virhash.h
index baf92996a3f4d52db71c100e0bba5ffc88eebe9f..b136455f1f58a151d480cda4cf082bc340f10f3c 100644 (file)
--- a/src/util/virhash.h
+++ b/src/util/virhash.h
@@ -112,8 +112,6 @@ typedef void (*virHashKeyFree)(void *name);
  * Constructor and destructor.
  */
 virHashTablePtr virHashNew(virHashDataFree dataFree);
-virHashTablePtr virHashCreate(ssize_t size,
-                              virHashDataFree dataFree);
 virHashAtomicPtr virHashAtomicNew(virHashDataFree dataFree);
 virHashTablePtr virHashCreateFull(ssize_t size,
                                   virHashDataFree dataFree,

diff --git a/src/util/viriptables.c b/src/util/viriptables.c
index b5dd2edbd3793f1209b1d38bc057bd499e159fc3..beab42be2607dd187ba0a1afd9618f6bd0041c32 100644 (file)
--- a/src/util/viriptables.c
+++ b/src/util/viriptables.c
@@ -76,9 +76,9 @@ iptablesPrivateChainCreate(virFirewallPtr fw,
     int ret = -1;
     size_t i;
 
-    if (!(chains = virHashCreate(50, NULL)))
+    if (!(chains = virHashNew(NULL)))
         goto cleanup;
-    if (!(links = virHashCreate(50, NULL)))
+    if (!(links = virHashNew(NULL)))
         goto cleanup;
 
     tmp = lines;

diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index ef370936a3aa9940928037bf1b9e7ecf88e84514..30d6a19d1dcaaab9b73466eb833295e347f77b90 100644 (file)
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -251,8 +251,7 @@ virLockSpacePtr virLockSpaceNew(const char *directory)
 
     lockspace->dir = g_strdup(directory);
 
-    if (!(lockspace->resources = virHashCreate(VIR_LOCKSPACE_TABLE_SIZE,
-                                               virLockSpaceResourceDataFree)))
+    if (!(lockspace->resources = virHashNew(virLockSpaceResourceDataFree)))
         goto error;
 
     if (directory) {
@@ -299,8 +298,7 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object)
         return NULL;
     }
 
-    if (!(lockspace->resources = virHashCreate(VIR_LOCKSPACE_TABLE_SIZE,
-                                               virLockSpaceResourceDataFree)))
+    if (!(lockspace->resources = virHashNew(virLockSpaceResourceDataFree)))
         goto error;
 
     if (virJSONValueObjectHasKey(object, "directory")) {

diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c
index 4b5e24718de4784a8af89fae5db109e9821bcaf3..94e73f3530446ef8482d7b426966a6f6692e8501 100644 (file)
--- a/src/util/virmacmap.c
+++ b/src/util/virmacmap.c
@@ -299,7 +299,7 @@ virMacMapNew(const char *file)
         return NULL;
 
     virObjectLock(mgr);
-    if (!(mgr->macs = virHashCreate(VIR_MAC_HASH_TABLE_SIZE, NULL)))
+    if (!(mgr->macs = virHashNew(NULL)))
         goto error;
 
     if (file &&

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 82388ae544c9f39ef383c7643611e11921946599..33db43cd928d14cad6e673aa1dd1d3a14e9eea16 100644 (file)
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -4310,7 +4310,7 @@ virStorageFileCanonicalizePath(const char *path,
             beginDoubleSlash = true;
     }
 
-    if (!(cycle = virHashCreate(10, NULL)))
+    if (!(cycle = virHashNew(NULL)))
         goto cleanup;
 
     if (!(components = virStringSplitCount(path, "/", 0, &ncomponents)))
@@ -5317,7 +5317,7 @@ virStorageFileGetMetadata(virStorageSourcePtr src,
               src->path, src->format, (unsigned int)uid, (unsigned int)gid,
               report_broken);
 
-    if (!(cycle = virHashCreate(5, NULL)))
+    if (!(cycle = virHashNew(NULL)))
         return -1;
 
     if (src->format <= VIR_STORAGE_FILE_NONE) {

diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c
index 8373ee6509b5a9f864c701da629bfcdbc163ce66..09f80a16195ab59150e740a805d1f67c5cccb1d6 100644 (file)
--- a/src/util/virsystemd.c
+++ b/src/util/virsystemd.c
@@ -896,7 +896,7 @@ virSystemdActivationNew(virSystemdActivationMap *map,
     VIR_DEBUG("Activated with %d FDs", nfds);
     act = g_new0(virSystemdActivation, 1);
 
-    if (!(act->fds = virHashCreate(10, virSystemdActivationEntryFree)))
+    if (!(act->fds = virHashNew(virSystemdActivationEntryFree)))
         goto error;
 
     fdnames = getenv("LISTEN_FDNAMES");

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 0611fdfd345815d26ffe60a5ecc1c95f586a4be6..f50ecdeb3f21815e0ac8a33615b86a44a9098117 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 = virHashCreate(32, virHashValueFree)) ||
-        !(expectedBlockDevices = virHashCreate(32, virHashValueFree)))
+    if (!(blockDevices = virHashNew(virHashValueFree)) ||
+        !(expectedBlockDevices = virHashNew(virHashValueFree)))
         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 = virHashCreate(10, virHashValueFree)))
+    if (!(blockstats = virHashNew(virHashValueFree)))
         goto cleanup;
 
     if (qemuMonitorTestAddItem(test, "query-blockstats", reply) < 0)
@@ -2018,8 +2018,8 @@ testQemuMonitorJSONqemuMonitorJSONGetChardevInfo(const void *opaque)
     if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema)))
         return -1;
 
-    if (!(info = virHashCreate(32, qemuMonitorChardevInfoFree)) ||
-        !(expectedInfo = virHashCreate(32, NULL)))
+    if (!(info = virHashNew(qemuMonitorChardevInfoFree)) ||
+        !(expectedInfo = virHashNew(NULL)))
         goto cleanup;
 
     if (virHashAddEntry(expectedInfo, "charserial1", &info1) < 0 ||

diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c
index 6366432dd48fe60914dcf07295e8f6a7bda1e73c..c1344b3daa635df58e28c8a673738362a2ea234a 100644 (file)
--- a/tests/qemusecuritymock.c
+++ b/tests/qemusecuritymock.c
@@ -85,12 +85,12 @@ init_hash(void)
     if (xattr_paths)
         return;
 
-    if (!(xattr_paths = virHashCreate(10, virHashValueFree))) {
+    if (!(xattr_paths = virHashNew(virHashValueFree))) {
         fprintf(stderr, "Unable to create hash table for XATTR paths\n");
         abort();
     }
 
-    if (!(chown_paths = virHashCreate(10, virHashValueFree))) {
+    if (!(chown_paths = virHashNew(virHashValueFree))) {
         fprintf(stderr, "Unable to create hash table for chowned paths\n");
         abort();
     }

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 5b23888a98bff20c89b25124e96eb258114fe1ba..3f50d46d87475c8d5323093a327b43ef95e9ea61 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -576,7 +576,7 @@ testQemuGetLatestCaps(void)
     virHashTablePtr capslatest;
     size_t i;
 
-    if (!(capslatest = virHashCreate(4, virHashValueFree)))
+    if (!(capslatest = virHashNew(virHashValueFree)))
         goto error;
 
     VIR_TEST_VERBOSE("");

diff --git a/tests/virhashtest.c b/tests/virhashtest.c
index bc93c07d1f3a91a58b4554b4984a2161197afa8b..0ba5b9ed31d218bcf30904eb05976cf760d51cb4 100644 (file)
--- a/tests/virhashtest.c
+++ b/tests/virhashtest.c
@@ -388,7 +388,7 @@ testHashGetItems(const void *data G_GNUC_UNUSED)
     char value2[] = "2";
     char value3[] = "3";
 
-    if (!(hash = virHashCreate(0, NULL)) ||
+    if (!(hash = virHashNew(NULL)) ||
         virHashAddEntry(hash, keya, value3) < 0 ||
         virHashAddEntry(hash, keyc, value1) < 0 ||
         virHashAddEntry(hash, keyb, value2) < 0) {
@@ -458,8 +458,8 @@ testHashEqual(const void *data G_GNUC_UNUSED)
     char value3_u[] = "O";
     char value4_u[] = "P";
 
-    if (!(hash1 = virHashCreate(0, NULL)) ||
-        !(hash2 = virHashCreate(0, NULL)) ||
+    if (!(hash1 = virHashNew(NULL)) ||
+        !(hash2 = virHashNew(NULL)) ||
         virHashAddEntry(hash1, keya, value1_l) < 0 ||
         virHashAddEntry(hash1, keyb, value2_l) < 0 ||
         virHashAddEntry(hash1, keyc, value3_l) < 0 ||
@@ -508,7 +508,7 @@ testHashDuplicate(const void *data G_GNUC_UNUSED)
 {
     g_autoptr(virHashTable) hash = NULL;
 
-    if (!(hash = virHashCreate(0, NULL)))
+    if (!(hash = virHashNew(NULL)))
         return -1;
 
     if (virHashAddEntry(hash, "a", NULL) < 0) {