]> xenbits.xensource.com Git - libvirt.git/commitdiff
Remove checking of return value of virHashNew
authorPeter Krempa <pkrempa@redhat.com>
Tue, 28 Jan 2020 12:40:24 +0000 (13:40 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 31 Jan 2020 13:28:28 +0000 (14:28 +0100)
There are two calls to virHashNew which check the return value. It's not
necessary any more as virHashNew always returns a valid pointer.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/conf/backup_conf.c
src/qemu/qemu_monitor_json.c

index b370b686f1a0b0b16cd6c1db6e2881216089ee99..64c8f6cc09f8be874bf602748d0a5d4c6549c222 100644 (file)
@@ -439,15 +439,11 @@ virDomainBackupAlignDisks(virDomainBackupDefPtr def,
                           virDomainDefPtr dom,
                           const char *suffix)
 {
-    g_autoptr(virHashTable) disks = NULL;
+    g_autoptr(virHashTable) disks = virHashNew(NULL);
     size_t i;
     int ndisks;
     bool backup_all = false;
 
-
-    if (!(disks = virHashNew(NULL)))
-        return -1;
-
     /* Unlikely to have a guest without disks but technically possible.  */
     if (!dom->ndisks) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
index e27f3085c41f9b17673c0fed92cdd3d4624ee322..981d091ba05d2bfa533089a4e2282cd78c1a2e2e 100644 (file)
@@ -2990,8 +2990,7 @@ qemuMonitorJSONBlockGetNamedNodeDataJSON(virJSONValuePtr nodes)
 {
     g_autoptr(virHashTable) ret = NULL;
 
-    if (!(ret = virHashNew((virHashDataFree) qemuMonitorJSONBlockNamedNodeDataFree)))
-        return NULL;
+    ret = virHashNew((virHashDataFree) qemuMonitorJSONBlockNamedNodeDataFree);
 
     if (virJSONValueArrayForeachSteal(nodes,
                                       qemuMonitorJSONBlockGetNamedNodeDataWorker,