From c30410a0c47b204cfea6e6acf106431042aa7ac9 Mon Sep 17 00:00:00 2001
From: Tim Wiederhake <twiederh@redhat.com>
Date: Tue, 6 Jul 2021 14:37:58 +0200
Subject: [PATCH] qemuMonitorGetChardevInfo: Use automatic memory management

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/qemu/qemu_monitor.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index cb59fc7b7b..769866e585 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2884,25 +2884,20 @@ int
 qemuMonitorGetChardevInfo(qemuMonitor *mon,
                           GHashTable **retinfo)
 {
-    GHashTable *info = NULL;
+    g_autoptr(GHashTable) info = NULL;
 
     VIR_DEBUG("retinfo=%p", retinfo);
 
-    QEMU_CHECK_MONITOR_GOTO(mon, error);
+    QEMU_CHECK_MONITOR(mon);
 
     if (!(info = virHashNew(qemuMonitorChardevInfoFree)))
-        goto error;
+        return -1;
 
     if (qemuMonitorJSONGetChardevInfo(mon, info) < 0)
-        goto error;
+        return -1;
 
-    *retinfo = info;
+    *retinfo = g_steal_pointer(&info);
     return 0;
-
- error:
-    virHashFree(info);
-    *retinfo = NULL;
-    return -1;
 }