From 6e9ddad43b93a8a7f096e1ecf298f6ab00605a92 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 30 Nov 2021 11:49:24 +0100 Subject: [PATCH] qemuRefreshPRManagerState: 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 | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a68a9d8230..f0471df045 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2291,25 +2291,22 @@ qemuRefreshPRManagerState(virQEMUDriver *driver, virDomainObj *vm) { qemuDomainObjPrivate *priv = vm->privateData; - GHashTable *info = NULL; - int ret = -1; + g_autoptr(GHashTable) info = NULL; + int rc; if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_PR_MANAGER_HELPER) || !qemuDomainDefHasManagedPR(vm)) return 0; qemuDomainObjEnterMonitor(driver, vm); - ret = qemuMonitorGetPRManagerInfo(priv->mon, &info); + rc = qemuMonitorGetPRManagerInfo(priv->mon, &info); qemuDomainObjExitMonitor(driver, vm); - if (ret < 0) - goto cleanup; + if (rc < 0) + return -1; - ret = qemuProcessRefreshPRManagerState(vm, info); - cleanup: - virHashFree(info); - return ret; + return qemuProcessRefreshPRManagerState(vm, info); }