[libvirt PATCH v2 03/11] qemuMonitorGetAllBlockStatsInfo: Assign hash table only on success

Tim Wiederhake twiederh at redhat.com
Tue Jul 6 12:37:51 UTC 2021


`virHashNew` cannot return NULL, the check is not needed.

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

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 19fcc5658b..d24531832b 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2155,22 +2155,24 @@ qemuMonitorGetAllBlockStatsInfo(qemuMonitor *mon,
                                 bool backingChain)
 {
     int ret;
+    GHashTable *stats = NULL;
     VIR_DEBUG("ret_stats=%p, backing=%d", ret_stats, backingChain);
 
     QEMU_CHECK_MONITOR(mon);
 
-    if (!(*ret_stats = virHashNew(g_free)))
+    if (!(stats = virHashNew(g_free)))
         goto error;
 
-    ret = qemuMonitorJSONGetAllBlockStatsInfo(mon, *ret_stats, backingChain);
+    ret = qemuMonitorJSONGetAllBlockStatsInfo(mon, stats, backingChain);
 
     if (ret < 0)
         goto error;
 
+    *ret_stats = stats;
     return ret;
 
  error:
-    virHashFree(*ret_stats);
+    virHashFree(stats);
     *ret_stats = NULL;
     return -1;
 }
-- 
2.31.1




More information about the libvir-list mailing list