diff options
| author | Peter Maydell | 2018-06-04 13:54:00 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-04 13:54:00 +0200 |
| commit | b74588a493c12c8d389f08004318c7d01ebfda70 (patch) | |
| tree | 4180c046efc7ed3a5e33275aeb6e54c3420f6097 /qapi | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/tcg-next-pull-request' into st... (diff) | |
| parent | migration: not wait RDMA_CM_EVENT_DISCONNECTED event after rdma_disconnect (diff) | |
| download | qemu-b74588a493c12c8d389f08004318c7d01ebfda70.tar.gz qemu-b74588a493c12c8d389f08004318c7d01ebfda70.tar.xz qemu-b74588a493c12c8d389f08004318c7d01ebfda70.zip | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20180604' into staging
migration/next for 20180604
# gpg: Signature made Mon 04 Jun 2018 05:14:24 BST
# gpg: using RSA key F487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg: aka "Juan Quintela <quintela@trasno.org>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03 4B82 F487 EF18 5872 D723
* remotes/juanquintela/tags/migration/20180604:
migration: not wait RDMA_CM_EVENT_DISCONNECTED event after rdma_disconnect
migration: remove unnecessary variables len in QIOChannelRDMA
migration: Don't activate block devices if using -S
migration: discard non-migratable RAMBlocks
migration: introduce decompress-error-check
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/migration.json | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qapi/migration.json b/qapi/migration.json index dc9cc85545..f7e10ee90f 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -376,13 +376,17 @@ # @postcopy-blocktime: Calculate downtime for postcopy live migration # (since 3.0) # +# @late-block-activate: If enabled, the destination will not activate block +# devices (and thus take locks) immediately at the end of migration. +# (since 3.0) +# # Since: 1.2 ## { 'enum': 'MigrationCapability', 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks', 'compress', 'events', 'postcopy-ram', 'x-colo', 'release-ram', 'block', 'return-path', 'pause-before-switchover', 'x-multifd', - 'dirty-bitmaps', 'postcopy-blocktime' ] } + 'dirty-bitmaps', 'postcopy-blocktime', 'late-block-activate' ] } ## # @MigrationCapabilityStatus: |