qemu: Migrate at unlimited speed by default

Previously, qemu did not respond to monitor commands during migration if
the limit was too high. This prevented us from raising the limit
earlier. The qemu issue seems to be fixed (according to my testing) and
we may remove the 32Mb/s limit.

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index f7cbe7f55a55e6881114b541e45c2ca68e496651..c47890b359631c84191077ee9d632316c2785637 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -217,7 +217,7 @@ static void *qemuDomainObjPrivateAlloc(void)
     if (!(priv->cons = virConsoleAlloc()))
         goto error;
 
-    priv->migMaxBandwidth = QEMU_DOMAIN_DEFAULT_MIG_BANDWIDTH_MAX;
+    priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX;
 
     return priv;
 

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index d5ea33d757a58f3a5b18bf0e54e612a2d218f79a..b96087e8778d594994ecf998dce5a54fca8f5bff 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -38,13 +38,12 @@
      (1 << VIR_DOMAIN_VIRT_KVM) |      \
      (1 << VIR_DOMAIN_VIRT_XEN))
 
-# define QEMU_DOMAIN_DEFAULT_MIG_BANDWIDTH_MAX 32
 # if ULONG_MAX == 4294967295
 /* Qemu has a 64-bit limit, but we are limited by our historical choice of
  * representing bandwidth in a long instead of a 64-bit int.  */
-#  define QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX    ULONG_MAX
+#  define QEMU_DOMAIN_MIG_BANDWIDTH_MAX ULONG_MAX
 # else
-#  define QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX    (INT64_MAX / (1024 * 1024))
+#  define QEMU_DOMAIN_MIG_BANDWIDTH_MAX (INT64_MAX / (1024 * 1024))
 # endif
 
 # define JOB_MASK(job)                  (1 << (job - 1))

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 57b639f0c57262dd911471512d2c54981990eede..74b70c76ccf76ef1b6479eb526cfcaedf37ed96d 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3187,8 +3187,8 @@ qemuMigrationToFile(struct qemud_driver *driver, virDomainObjPtr vm,
      * Failure to change migration speed is not fatal. */
     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) {
         qemuMonitorSetMigrationSpeed(priv->mon,
-                                     QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX);
-        priv->migMaxBandwidth = QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX;
+                                     QEMU_DOMAIN_MIG_BANDWIDTH_MAX);
+        priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX;
         qemuDomainObjExitMonitorWithDriver(driver, vm);
     }