]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemuMonitorJSONGetAllBlockJobInfo: Use automatic memory management
authorTim Wiederhake <twiederh@redhat.com>
Mon, 5 Jul 2021 14:17:09 +0000 (16:17 +0200)
committerTim Wiederhake <twiederh@redhat.com>
Mon, 19 Jul 2021 14:39:41 +0000 (16:39 +0200)
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
src/qemu/qemu_monitor_json.c

index 472308e1d390e26440bd22ab98aedb1e8a234012..59c5eedb0a0217a08fcc9d534515be9251ceea03 100644 (file)
@@ -5069,12 +5069,12 @@ GHashTable *
 qemuMonitorJSONGetAllBlockJobInfo(qemuMonitor *mon,
                                   bool rawjobname)
 {
-    virJSONValue *cmd = NULL;
-    virJSONValue *reply = NULL;
+    g_autoptr(virJSONValue) cmd = NULL;
+    g_autoptr(virJSONValue) reply = NULL;
     virJSONValue *data;
     size_t nr_results;
     size_t i;
-    GHashTable *blockJobs = NULL;
+    g_autoptr(GHashTable) blockJobs = NULL;
 
     cmd = qemuMonitorJSONMakeCommand("query-block-jobs", NULL);
     if (!cmd)
@@ -5103,14 +5103,10 @@ qemuMonitorJSONGetAllBlockJobInfo(qemuMonitor *mon,
     }
 
  cleanup:
-    virJSONValueFree(cmd);
-    virJSONValueFree(reply);
-    return blockJobs;
+    return g_steal_pointer(&blockJobs);
 
  error:
-    virHashFree(blockJobs);
-    blockJobs = NULL;
-    goto cleanup;
+    return NULL;
 }