summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Fehlig <jfehlig@suse.com>2011-12-15 11:25:07 -0700
committerJim Fehlig <jfehlig@suse.com>2011-12-15 11:25:07 -0700
commitd8916dc8e2f612ab3ce46f32c4bfeb0bd73f6007 (patch)
treeeab5cc2aeea7dee0f0a90d91910bf2352ec0fa8a
parentd758e0cb64e4a02a2f51de892fca4159952ac027 (diff)
downloadlibvirt-d8916dc8e2f612ab3ce46f32c4bfeb0bd73f6007.tar.gz
Fix default migration speed in qemu driver
In commit 6f84e110 I mistakenly set default migration speed to 33554432 Mb! The units of migMaxBandwidth is Mb, with conversion handled in qemuMonitor{JSON,Text}SetMigrationSpeed(). Also, remove definition of QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX since it is no longer used after reverting commit ef1065cf.
-rw-r--r--src/qemu/qemu_domain.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 35f9440f19..f40fa0923f 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -36,14 +36,7 @@
(1 << VIR_DOMAIN_VIRT_KVM) | \
(1 << VIR_DOMAIN_VIRT_XEN))
-# define QEMU_DOMAIN_DEFAULT_MIG_BANDWIDTH_MAX (32 << 20)
-# 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
-# else
-# define QEMU_DOMAIN_FILE_MIG_BANDWIDTH_MAX (INT64_MAX / (1024 * 1024))
-# endif
+# define QEMU_DOMAIN_DEFAULT_MIG_BANDWIDTH_MAX 32
# define JOB_MASK(job) (1 << (job - 1))
# define DEFAULT_JOB_MASK \