]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemuMigrationCookieAddNBD: Remove 'ret' variable and 'cleanup' label
authorPeter Krempa <pkrempa@redhat.com>
Thu, 30 Jan 2020 14:06:14 +0000 (15:06 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 31 Jan 2020 13:28:29 +0000 (14:28 +0100)
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/qemu/qemu_migration_cookie.c

index 968a9b589c151dbb020da27f188c557f7986add3..734d95f4f1cb44bbed60d5fb029ee99591e36124 100644 (file)
@@ -456,7 +456,7 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
     qemuDomainObjPrivatePtr priv = vm->privateData;
     g_autoptr(virHashTable) stats = virHashNew(virHashValueFree);
     size_t i;
-    int ret = -1, rc;
+    int rc;
 
     /* It is not a bug if there already is a NBD data */
     qemuMigrationCookieNBDFree(mig->nbd);
@@ -473,10 +473,10 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
     mig->nbd->ndisks = 0;
 
     if (qemuDomainObjEnterMonitorAsync(driver, vm, priv->job.asyncJob) < 0)
-        goto cleanup;
+        return -1;
     rc = qemuMonitorBlockStatsUpdateCapacity(priv->mon, stats, false);
     if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
-        goto cleanup;
+        return -1;
 
     for (i = 0; i < vm->def->ndisks; i++) {
         virDomainDiskDefPtr disk = vm->def->disks[i];
@@ -491,9 +491,7 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig,
         mig->nbd->ndisks++;
     }
 
-    ret = 0;
- cleanup:
-    return ret;
+    return 0;
 }