qemuProcessRefreshDisks: 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 1edec1a5bbec120b36779de64510c2961d798e05..f9be19d213fe99f2733bb4df54e7283ea377838d 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8310,8 +8310,7 @@ qemuProcessRefreshDisks(virQEMUDriver *driver,
 {
     qemuDomainObjPrivate *priv = vm->privateData;
     bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
-    GHashTable *table = NULL;
-    int ret = -1;
+    g_autoptr(GHashTable) table = NULL;
     size_t i;
 
     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) {
@@ -8320,7 +8319,7 @@ qemuProcessRefreshDisks(virQEMUDriver *driver,
     }
 
     if (!table)
-        goto cleanup;
+        return -1;
 
     for (i = 0; i < vm->def->ndisks; i++) {
         virDomainDiskDef *disk = vm->def->disks[i];
@@ -8351,11 +8350,7 @@ qemuProcessRefreshDisks(virQEMUDriver *driver,
         diskpriv->tray = info->tray;
     }
 
-    ret = 0;
-
- cleanup:
-    virHashFree(table);
-    return ret;
+    return 0;
 }