From: weiwei li <weiweili821@gmail.com>
Date: Fri, 31 Oct 2014 08:16:22 +0000 (+0800)
Subject: qemu: Release nbd port from migrationPorts instead of remotePorts
X-Git-Tag: v1.2.9.1~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65599f277768233b828745251c9b9fbee470cb17;p=thirdparty%2Flibvirt.git

qemu: Release nbd port from migrationPorts instead of remotePorts

commit 3e1e16aa8d4238241a1806cb9bdb3b9ad60db777 (Use a port from the
migration range for NBD as well) changed ndb port allocation from
remotePorts to migrationPorts, but did not change the port releasing
process, which makes an error when migrating several times (above 64):
error: internal error: Unable to find an unused port in range
'migration' (49152-49215)

https://bugzilla.redhat.com/show_bug.cgi?id=1159245

Signed-off-by: Weiwei Li <nuonuoli@tencent.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
(cherry picked from commit be598c5ff84656d3498b950d473fafe5b86f87b4)
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 2a96661a01..a5215e5248 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1389,7 +1389,7 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver,
  cleanup:
     VIR_FREE(diskAlias);
     if (ret < 0)
-        virPortAllocatorRelease(driver->remotePorts, port);
+        virPortAllocatorRelease(driver->migrationPorts, port);
     return ret;
 }
 
@@ -1595,7 +1595,7 @@ qemuMigrationStopNBDServer(virQEMUDriverPtr driver,
 
     qemuDomainObjExitMonitor(driver, vm);
 
-    virPortAllocatorRelease(driver->remotePorts, priv->nbdPort);
+    virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort);
     priv->nbdPort = 0;
 }
 
@@ -2821,7 +2821,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
     VIR_FORCE_CLOSE(dataFD[1]);
     if (vm) {
         if (ret < 0) {
-            virPortAllocatorRelease(driver->remotePorts, priv->nbdPort);
+            virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort);
             priv->nbdPort = 0;
         }
         if (ret >= 0 || vm->persistent)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 712a25e022..38bd605da0 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4797,7 +4797,7 @@ void qemuProcessStop(virQEMUDriverPtr driver,
         }
     }
 
-    virPortAllocatorRelease(driver->remotePorts, priv->nbdPort);
+    virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort);
     priv->nbdPort = 0;
 
     if (priv->agent) {