qemuRefreshVirtioChannelState: 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 e1b5e68237f58b0d659b4e37264dafe184a5099b..a68a9d82300404940c782faf80be221089e2f3c9 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2243,24 +2243,21 @@ qemuRefreshVirtioChannelState(virQEMUDriver *driver,
                               qemuDomainAsyncJob asyncJob)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
-    GHashTable *info = NULL;
-    int ret = -1;
+    g_autoptr(GHashTable) info = NULL;
+    int rc;
 
     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
-        goto cleanup;
+        return -1;
 
-    ret = qemuMonitorGetChardevInfo(priv->mon, &info);
+    rc = qemuMonitorGetChardevInfo(priv->mon, &info);
     qemuDomainObjExitMonitor(driver, vm);
 
-    if (ret < 0)
-        goto cleanup;
+    if (rc < 0)
+        return -1;
 
     qemuProcessRefreshChannelVirtioState(driver, vm, info, false);
-    ret = 0;
 
- cleanup:
-    virHashFree(info);
-    return ret;
+    return 0;
 }