diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-12-16 14:53:23 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-12-16 14:53:23 +0000 |
| commit | 4db753b1ac4aedc6cd67fb13d50e5015ce8052a5 (patch) | |
| tree | 73b6bd91ecca384d5efe16e193966b663a9367eb /qmp-commands.hx | |
| parent | dfa9c2a0f4d0a0c8b2c1449ecdbb1297427e1560 (diff) | |
| parent | 44a1f94684eeaa6e312ea2d77ede266a81d31210 (diff) | |
| download | hqemu-4db753b1ac4aedc6cd67fb13d50e5015ce8052a5.zip hqemu-4db753b1ac4aedc6cd67fb13d50e5015ce8052a5.tar.gz | |
Merge remote-tracking branch 'remotes/amit-migration/tags/for-2.3-2' into staging
Migration pull for 2.3. Mostly moving the code to the migration/
directory, and updating MAINTAINERS.
I've also folded my other MAINTAINERS update patches into this, as
they're small by themselves.
# gpg: Signature made Tue 16 Dec 2014 12:21:24 GMT using RSA key ID 854083B6
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg: aka "Amit Shah <amit@kernel.org>"
# gpg: aka "Amit Shah <amitshah@gmx.net>"
* remotes/amit-migration/tags/for-2.3-2:
MAINTAINERS: Update for migrated migration code
Split the QEMU buffered file code out
Split struct QEMUFile out
Remove migration- pre/post fixes off files in migration/ dir
Start migrating migration code into a migration directory
qmp-command.hx: add missing docs for migration capabilites
cpu: verify that block->host is set
cpu: assert host pointer offset within block
exec: add wrapper for host pointer access
MAINTAINERS: add include files to virtio-serial entry
MAINTAINERS: add entry for virtio-rng
MAINTAINERS: migration: add vmstate static checker files
MAINTAINERS: Add myself to migration maintainers
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qmp-commands.hx')
| -rw-r--r-- | qmp-commands.hx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/qmp-commands.hx b/qmp-commands.hx index 3348782..6945d30 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -3184,6 +3184,9 @@ migrate-set-capabilities Enable/Disable migration capabilities - "xbzrle": XBZRLE support +- "rdma-pin-all": pin all pages when using RDMA during migration +- "auto-converge": throttle down guest to help convergence of migration +- "zero-blocks": compress zero blocks during block migration Arguments: @@ -3208,6 +3211,9 @@ Query current migration capabilities - "capabilities": migration capabilities state - "xbzrle" : XBZRLE state (json-bool) + - "rdma-pin-all" : RDMA Pin Page state (json-bool) + - "auto-converge" : Auto Converge state (json-bool) + - "zero-blocks" : Zero Blocks state (json-bool) Arguments: |
