From: Anthony Liguori Date: Mon, 19 Mar 2012 18:39:42 +0000 (-0500) Subject: Merge remote-tracking branch 'sstabellini/saverestore-8' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=33cf629a3754b58a1e2dbbe01d91d97e712b7c06;p=qemu.git Merge remote-tracking branch 'sstabellini/saverestore-8' into staging * sstabellini/saverestore-8: xen: do not allocate RAM during INMIGRATE runstate xen mapcache: check if memory region has moved. xen: record physmap changes to xenstore Set runstate to INMIGRATE earlier Introduce "xen-save-devices-state" cirrus_vga: do not reset videoram Conflicts: qapi-schema.json Signed-off-by: Anthony Liguori --- 33cf629a3754b58a1e2dbbe01d91d97e712b7c06 diff --cc qapi-schema.json index 3a962c1b40,def69a9ebd..0d11d6eb14 --- a/qapi-schema.json +++ b/qapi-schema.json @@@ -1665,22 -1595,20 +1665,39 @@@ 'returns': [ 'ObjectTypeInfo' ] } ## +# @migrate +# +# Migrates the current running guest to another Virtual Machine. +# +# @uri: the Uniform Resource Identifier of the destination VM +# +# @blk: #optional do block migration (full disk copy) +# +# @inc: #optional incremental disk copy migration +# +# @detach: this argument exists only for compatibility reasons and +# is ignored by QEMU +# +# Returns: nothing on success +# +# Since: 0.14.0 +## +{ 'command': 'migrate', + 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*detach': 'bool' } } ++ + # @xen-save-devices-state: + # + # Save the state of all devices to file. The RAM and the block devices + # of the VM are not saved by this command. + # + # @filename: the file to save the state of the devices to as binary + # data. See xen-save-devices-state.txt for a description of the binary + # format. + # + # Returns: Nothing on success + # If @filename cannot be opened, OpenFileFailed + # If an I/O error occurs while writing the file, IOError + # + # Since: 1.1 + ## + { 'command': 'xen-save-devices-state', 'data': {'filename': 'str'} } -