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 3a962c1,def69a9..0d11d6e
--- 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
index 8b82038,dbb6236..c626ba8
--- 1/qmp-commands.hx
--- 2/qmp-commands.hx
+++ b/qmp-commands.hx
@@@ -444,9 -444,43 +444,36 @@@ Note: inject-nmi is only supported for 
  EQMP
  
      {
+         .name       = "xen-save-devices-state",
+         .args_type  = "filename:F",
+     .mhandler.cmd_new = qmp_marshal_input_xen_save_devices_state,
+     },
+ 
+ SQMP
+ 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.
+ 
+ Arguments:
+ 
+ - "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.
+ 
+ Example:
+ 
+ -> { "execute": "xen-save-devices-state",
+      "arguments": { "filename": "/tmp/save" } }
+ <- { "return": {} }
+ 
+ EQMP
+ 
+     {
          .name       = "migrate",
          .args_type  = "detach:-d,blk:-b,inc:-i,uri:s",
 -        .params     = "[-d] [-b] [-i] uri",
 -        .help       = "migrate to URI (using -d to not wait for completion)"
 -                    "\n\t\t\t -b for migration without shared storage with"
 -                    " full copy of disk\n\t\t\t -i for migration without "
 -                    "shared storage with incremental copy of disk "
 -                    "(base image shared between src and destination)",
 -        .user_print = monitor_user_noop,      
 -      .mhandler.cmd_new = do_migrate,
 +        .mhandler.cmd_new = qmp_marshal_input_migrate,
      },
  
  SQMP

diff --cc savevm.c
Simple merge

diff --cc vl.c
Simple merge

diff --cc xen-all.c
Simple merge