From b59430d107f40760f7a121f5d0d4444734ee4ffe Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 30 Nov 2021 11:49:24 +0100 Subject: [PATCH] qemuRefreshVirtioChannelState: Automatically free GHashTable and refactor cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko Reviewed-by: Martin Kletzander --- src/qemu/qemu_process.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e1b5e68237..a68a9d8230 100644 --- 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; }