qemuProcessRefreshLegacyBlockjobs: Automatically free GHashTable and refactor cleanup

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index f9be19d213fe99f2733bb4df54e7283ea377838d..6b83a571b9164c3deb2ca07d88663d2c059fa653 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8534,24 +8534,19 @@ static int
 qemuProcessRefreshLegacyBlockjobs(virQEMUDriver *driver,
                                   virDomainObj *vm)
 {
-    GHashTable *blockJobs = NULL;
-    int ret = -1;
+    g_autoptr(GHashTable) blockJobs = NULL;
 
     qemuDomainObjEnterMonitor(driver, vm);
     blockJobs = qemuMonitorGetAllBlockJobInfo(qemuDomainGetMonitor(vm), true);
     qemuDomainObjExitMonitor(driver, vm);
 
     if (!blockJobs)
-        goto cleanup;
+        return -1;
 
     if (virHashForEach(blockJobs, qemuProcessRefreshLegacyBlockjob, vm) < 0)
-        goto cleanup;
-
-    ret = 0;
+        return -1;
 
- cleanup:
-    virHashFree(blockJobs);
-    return ret;
+    return 0;
 }