[PATCH 13/23] qemuProcessRefreshDisks: Automatically free GHashTable and refactor cleanup
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_process.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index d1b34612ee..382d562fb1 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8316,18 +8316,17 @@ 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) {
table = qemuMonitorGetBlockInfo(priv->mon);
if (qemuDomainObjExitMonitor(driver, vm) < 0)
- goto cleanup;
+ return -1;
}
if (!table)
- goto cleanup;
+ return -1;
for (i = 0; i < vm->def->ndisks; i++) {
virDomainDiskDef *disk = vm->def->disks[i];
@@ -8358,11 +8357,7 @@ qemuProcessRefreshDisks(virQEMUDriver *driver,
diskpriv->tray = info->tray;
}
- ret = 0;
-
- cleanup:
- virHashFree(table);
- return ret;
+ return 0;
}
--
2.31.1