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 <aliguori@us.ibm.com>

diff --cc qapi-schema.json
index 3a962c1b40262b678677efb253e288ee597275e2,def69a9ebdfcdcf0bfb9a1ead1f4c247cfbbc4d5..0d11d6eb14888c3a6e96f410f6543f79845dea18
--- 1/qapi-schema.json
--- 2/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'} }

diff --cc qmp-commands.hx
Simple merge

diff --cc savevm.c
Simple merge

diff --cc vl.c
Simple merge

diff --cc xen-all.c
Simple merge