diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-15 14:49:15 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-15 14:49:16 -0500 |
| commit | 6453a3a69488196f26d12654c6b148446abdf3d6 (patch) | |
| tree | 18c32e6d80c54c0ecc6edfe0ddbccbe63a6afd5a /qapi-schema.json | |
| parent | 2562becfc126ed7678c662ee23b7c1fe135d8966 (diff) | |
| parent | 7ca1dfad952d8a8655b32e78623edcc38a51b14a (diff) | |
| download | qemu-6453a3a69488196f26d12654c6b148446abdf3d6.tar.gz qemu-6453a3a69488196f26d12654c6b148446abdf3d6.tar.bz2 qemu-6453a3a69488196f26d12654c6b148446abdf3d6.zip | |
Merge remote-tracking branch 'quintela/migration.next' into staging
# By Chegu Vinod
# Via Juan Quintela
* quintela/migration.next:
Force auto-convegence of live migration
Add 'auto-converge' migration capability
Introduce async_run_on_cpu()
Message-id: 1373664508-5404-1-git-send-email-quintela@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qapi-schema.json')
| -rw-r--r-- | qapi-schema.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index cf57783caf..7b9fef1bd1 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -616,7 +616,7 @@ # Since: 1.2 ## { 'enum': 'MigrationCapability', - 'data': ['xbzrle', 'x-rdma-pin-all'] } + 'data': ['xbzrle', 'x-rdma-pin-all', 'auto-converge'] } ## # @MigrationCapabilityStatus |