From 3e6ecac77da1e9f302f81a68dded6bd226430682 Mon Sep 17 00:00:00 2001 Message-Id: <3e6ecac77da1e9f302f81a68dded6bd226430682@dist-git> From: Peter Krempa Date: Tue, 4 Feb 2020 15:08:06 +0100 Subject: [PATCH] qemuMigrationCookieAddNBD: Use virHashNew and automatic freeing of virHashTablePtr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Swithc to the helper which doesn't require checking of the return value. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik (cherry picked from commit 45eefb2c78cfe2b14d5bc5fb150ffbed18991fde) https://bugzilla.redhat.com/show_bug.cgi?id=1793263 Message-Id: <06db6f97ebb2266ea197ce13cbc9051e4c839fdf.1580824112.git.pkrempa@redhat.com> Reviewed-by: Ján Tomko --- src/qemu/qemu_migration_cookie.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index 33ab6cb7a5..968a9b589c 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -454,7 +454,7 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; - virHashTablePtr stats = NULL; + g_autoptr(virHashTable) stats = virHashNew(virHashValueFree); size_t i; int ret = -1, rc; @@ -472,9 +472,6 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig, mig->nbd->disks = g_new0(struct qemuMigrationCookieNBDDisk, vm->def->ndisks); mig->nbd->ndisks = 0; - if (!(stats = virHashCreate(10, virHashValueFree))) - goto cleanup; - if (qemuDomainObjEnterMonitorAsync(driver, vm, priv->job.asyncJob) < 0) goto cleanup; rc = qemuMonitorBlockStatsUpdateCapacity(priv->mon, stats, false); @@ -496,7 +493,6 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig, ret = 0; cleanup: - virHashFree(stats); return ret; } -- 2.25.0