From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 30 Nov 2021 10:49:24 +0000 (+0100)
Subject: qemuProcessRefreshLegacyBlockjobs: Automatically free GHashTable and refactor cleanup
X-Git-Tag: v8.0.0-rc1~417
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e552a0d50222b966445fcdb3dd0c2fff71c89278;p=thirdparty%2Flibvirt.git

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 f9be19d213..6b83a571b9 100644
--- 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;
 }