diff options
| author | Anthony Liguori | 2013-07-23 17:57:23 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-07-23 17:57:23 +0200 |
| commit | f03d07d4683b2e8325a7cb60b4e14b977b1a869c (patch) | |
| tree | 6e1d1204a3a9b939a7b1badbf7749fd8fe896efa /qapi-schema.json | |
| parent | Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging (diff) | |
| parent | migration: add autoconvergence documentation (diff) | |
| download | qemu-f03d07d4683b2e8325a7cb60b4e14b977b1a869c.tar.gz qemu-f03d07d4683b2e8325a7cb60b4e14b977b1a869c.tar.xz qemu-f03d07d4683b2e8325a7cb60b4e14b977b1a869c.zip | |
Merge remote-tracking branch 'quintela/migration.next' into staging
# By Michael R. Hines (8) and others
# Via Juan Quintela
* quintela/migration.next:
migration: add autoconvergence documentation
Fix real mode guest segments dpl value in savevm
Fix real mode guest migration
rdma: account for the time spent in MIG_STATE_SETUP through QMP
rdma: introduce MIG_STATE_NONE and change MIG_STATE_SETUP state transition
rdma: allow state transitions between other states besides ACTIVE
rdma: send pc.ram
rdma: core logic
rdma: introduce ram_handle_compressed()
rdma: bugfix: ram_control_save_page()
rdma: update documentation to reflect new unpin support
Message-id: 1374590725-14144-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 | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index 592bb9c7a1..f82d829fdc 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -578,6 +578,12 @@ # expected downtime in milliseconds for the guest in last walk # of the dirty bitmap. (since 1.3) # +# @setup-time: #optional amount of setup time in milliseconds _before_ the +# iterations begin but _after_ the QMP command is issued. This is designed +# to provide an accounting of any activities (such as RDMA pinning) which +# may be expensive, but do not actually occur during the iterative +# migration rounds themselves. (since 1.6) +# # Since: 0.14.0 ## { 'type': 'MigrationInfo', @@ -586,7 +592,8 @@ '*xbzrle-cache': 'XBZRLECacheStats', '*total-time': 'int', '*expected-downtime': 'int', - '*downtime': 'int'} } + '*downtime': 'int', + '*setup-time': 'int'} } ## # @query-migrate @@ -619,6 +626,9 @@ # to enable the capability on the source VM. The feature is disabled by # default. (since 1.6) # +# @auto-converge: If enabled, QEMU will automatically throttle down the guest +# to speed up convergence of RAM migration. (since 1.6) +# # Since: 1.2 ## { 'enum': 'MigrationCapability', |