From: Tim Wiederhake <twiederh@redhat.com>
Date: Mon, 5 Jul 2021 13:53:56 +0000 (+0200)
Subject: qemuBlockNodeNameGetBackingChain: `virHashNew` cannot return NULL
X-Git-Tag: v7.6.0-rc1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bfc24fb87e58b68b1c465558a99d5526ecb9c60;p=thirdparty%2Flibvirt.git

qemuBlockNodeNameGetBackingChain: `virHashNew` cannot return NULL

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 2815eb54fa..8150241015 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -231,22 +231,16 @@ qemuBlockNodeNameGetBackingChain(virJSONValue *namednodes,
                                  virJSONValue *blockstats)
 {
     struct qemuBlockNodeNameGetBackingChainData data;
-    g_autoptr(GHashTable) namednodestable = NULL;
-    g_autoptr(GHashTable) disks = NULL;
+    g_autoptr(GHashTable) namednodestable = virHashNew(virJSONValueHashFree);
+    g_autoptr(GHashTable) disks = virHashNew(qemuBlockNodeNameBackingChainDataHashEntryFree);
 
     memset(&data, 0, sizeof(data));
 
-    if (!(namednodestable = virHashNew(virJSONValueHashFree)))
-        return NULL;
-
     if (virJSONValueArrayForeachSteal(namednodes,
                                       qemuBlockNamedNodesArrayToHash,
                                       namednodestable) < 0)
         return NULL;
 
-    if (!(disks = virHashNew(qemuBlockNodeNameBackingChainDataHashEntryFree)))
-        return NULL;
-
     data.nodenamestable = namednodestable;
     data.disks = disks;