aboutsummaryrefslogtreecommitdiff
path: root/qapi-schema.json
diff options
context:
space:
mode:
authorMichael R. Hines <mrhines@us.ibm.com>2013-12-19 04:52:01 +0800
committerJuan Quintela <quintela@redhat.com>2014-02-25 14:30:28 +0100
commit41310c68781d742fa9bbfd5fcb1df9b7f23f5759 (patch)
treef56b23e2f01be810748a104eda4716c12fa17918 /qapi-schema.json
parent6d3cb1f970ee85361618f7ff02869180394e012d (diff)
downloadqemu-41310c68781d742fa9bbfd5fcb1df9b7f23f5759.zip
qemu-41310c68781d742fa9bbfd5fcb1df9b7f23f5759.tar.gz
qemu-41310c68781d742fa9bbfd5fcb1df9b7f23f5759.tar.bz2
rdma: rename 'x-rdma' => 'rdma'
As far as we can tell, all known bugs have been fixed: 1. Parallel migrations are working 2. IPv6 migration is working 3. virt-test is working I'm not comfortable sending the revised libvirt patch until this is accepted or review suggestions are addressed, (including pin-all support. It does not make sense to remove experimental for one thing and not the other. That's too many trips through the libvirt community). Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Michael R. Hines <mrhines@us.ibm.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'qapi-schema.json')
-rw-r--r--qapi-schema.json7
1 files changed, 3 insertions, 4 deletions
diff --git a/qapi-schema.json b/qapi-schema.json
index fcb22800..ac8ad24 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -751,10 +751,9 @@
# This feature allows us to minimize migration traffic for certain work
# loads, by sending compressed difference of the pages
#
-# @x-rdma-pin-all: Controls whether or not the entire VM memory footprint is
+# @rdma-pin-all: Controls whether or not the entire VM memory footprint is
# mlock()'d on demand or all at once. Refer to docs/rdma.txt for usage.
-# Disabled by default. Experimental: may (or may not) be renamed after
-# further testing is complete. (since 1.6)
+# Disabled by default. (since 2.0)
#
# @zero-blocks: During storage migration encode blocks of zeroes efficiently. This
# essentially saves 1MB of zeroes per block on the wire. Enabling requires
@@ -768,7 +767,7 @@
# Since: 1.2
##
{ 'enum': 'MigrationCapability',
- 'data': ['xbzrle', 'x-rdma-pin-all', 'auto-converge', 'zero-blocks'] }
+ 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks'] }
##
# @MigrationCapabilityStatus