projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b85a4ec c234572)
Merge remote-tracking branch 'sstabellini/saverestore-8' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Mar 2012 18:39:42 +0000 (13:39 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Mar 2012 18:39:42 +0000 (13:39 -0500)
commit33cf629a3754b58a1e2dbbe01d91d97e712b7c06
treefcf874262294eba07fb2f9eca11d594096847679tree | snapshot
parentb85a4ec8a7ce348f3f385a53df4e418f2f54c182commit | diff
parentc234572ded381423abca9801ebf5a32abd2495efcommit | diff
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>
qapi-schema.json diff1 | diff2 | blob | history
qmp-commands.hx diff1 | diff2 | blob | history
savevm.c diff1 | diff2 | blob | history
vl.c diff1 | diff2 | blob | history
xen-all.c diff1 | diff2 | blob | history
Domain: SDK / Emulator;