diff options
| author | Peter Maydell | 2015-03-16 15:45:09 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-03-16 15:45:09 +0100 |
| commit | bc68d2e5128284c8beb98b1c5b0331a0ed9f3197 (patch) | |
| tree | 1b195e276395920f19d7c8ca30aafb90416ebc71 /qapi-schema.json | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150316'... (diff) | |
| parent | pc: Disable vmdesc submission for old machines (diff) | |
| download | qemu-bc68d2e5128284c8beb98b1c5b0331a0ed9f3197.tar.gz qemu-bc68d2e5128284c8beb98b1c5b0331a0ed9f3197.tar.xz qemu-bc68d2e5128284c8beb98b1c5b0331a0ed9f3197.zip | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20150316' into staging
migration/next for 20150316
# gpg: Signature made Mon Mar 16 13:36:37 2015 GMT using RSA key ID 5872D723
# gpg: Can't check signature: public key not found
* remotes/juanquintela/tags/migration/20150316:
pc: Disable vmdesc submission for old machines
migration: Allow to suppress vmdesc submission
migration: Read JSON VM description on incoming migration
rename save_block_hdr to save_page_header
save_block_hdr: we can recalculate the cont parameter here
save_xbzrle_page: change calling convention
ram_save_page: change calling covention
ram_find_and_save_block: change calling convention
ram: make all save_page functions take a uint64_t parameter
Add migrate_incoming
Add -incoming defer
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi-schema.json')
| -rw-r--r-- | qapi-schema.json | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index 8141f71fb3..2b3e275983 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1738,6 +1738,21 @@ { 'command': 'migrate', 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*detach': 'bool' } } +## +# @migrate-incoming +# +# Start an incoming migration, the qemu must have been started +# with -incoming defer +# +# @uri: The Uniform Resource Identifier identifying the source or +# address to listen on +# +# Returns: nothing on success +# +# Since: 2.3 +## +{ 'command': 'migrate-incoming', 'data': {'uri': 'str' } } + # @xen-save-devices-state: # # Save the state of all devices to file. The RAM and the block devices |