diff options
| author | Anthony Liguori | 2012-03-19 19:39:42 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2012-03-19 19:39:42 +0100 |
| commit | 33cf629a3754b58a1e2dbbe01d91d97e712b7c06 (patch) | |
| tree | fcf874262294eba07fb2f9eca11d594096847679 /linux-user/socket.h | |
| parent | Merge remote-tracking branch 'stefanha/trivial-patches' into staging (diff) | |
| parent | xen: do not allocate RAM during INMIGRATE runstate (diff) | |
| download | qemu-33cf629a3754b58a1e2dbbe01d91d97e712b7c06.tar.gz qemu-33cf629a3754b58a1e2dbbe01d91d97e712b7c06.tar.xz qemu-33cf629a3754b58a1e2dbbe01d91d97e712b7c06.zip | |
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>
Diffstat (limited to 'linux-user/socket.h')
0 files changed, 0 insertions, 0 deletions
