]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemuMigrationCookieAddNBD: Use virHashNew and automatic freeing of virHashTablePtr
authorPeter Krempa <pkrempa@redhat.com>
Thu, 30 Jan 2020 14:01:41 +0000 (15:01 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 31 Jan 2020 13:28:29 +0000 (14:28 +0100)
Swithc to the helper which doesn't require checking of the return value.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/qemu/qemu_migration_cookie.c

index 33ab6cb7a5877d0eeab1dfa3de786779f14d67ad..968a9b589c151dbb020da27f188c557f7986add3 100644 (file)
@@ -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;
 }