[PATCH 1/4] qemu: qemuBlockGetNamedNodeData: Remove pointless error path

Peter Krempa pkrempa at redhat.com
Wed Nov 9 10:17:12 UTC 2022


We don't need automatic freeing for 'blockNamedNodeData' and we can
directly return it rather than checking it for NULL-ness first.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_block.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index b82e3311e1..e98b5d4739 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -2610,7 +2610,7 @@ qemuBlockGetNamedNodeData(virDomainObj *vm,
                           virDomainAsyncJob asyncJob)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
-    g_autoptr(GHashTable) blockNamedNodeData = NULL;
+    GHashTable *blockNamedNodeData = NULL;
     bool supports_flat = virQEMUCapsGet(priv->qemuCaps,
                                         QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT);

@@ -2621,10 +2621,7 @@ qemuBlockGetNamedNodeData(virDomainObj *vm,

     qemuDomainObjExitMonitor(vm);

-    if (!blockNamedNodeData)
-        return NULL;
-
-    return g_steal_pointer(&blockNamedNodeData);
+    return blockNamedNodeData;
 }


-- 
2.37.3



More information about the libvir-list mailing list