[PATCH 08/10] qemuMigrationCookieAddNBD: Use virHashNew and automatic freeing of virHashTablePtr

Peter Krempa pkrempa at redhat.com
Thu Jan 30 14:53:28 UTC 2020


Swithc to the helper which doesn't require checking of the return value.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 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.24.1




More information about the libvir-list mailing list