[libvirt PATCH 13/38] qemuBlockNodeNameGetBackingChain: `virHashNew` cannot return NULL

Tim Wiederhake twiederh at redhat.com
Thu Jul 22 07:50:05 UTC 2021


Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
---
 src/qemu/qemu_block.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

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;
 
-- 
2.31.1




More information about the libvir-list mailing list