diff options
| author | Peter Maydell | 2015-09-29 13:41:19 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-09-29 13:41:19 +0200 |
| commit | b2312c680084ea18cd55fa7093397cad2224ec14 (patch) | |
| tree | 75bc3b7650078c11f0c7ce539bf8e53798c12c07 /include/exec/memory.h | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20150925-1' in... (diff) | |
| parent | ram_find_and_save_block: Split out the finding (diff) | |
| download | qemu-b2312c680084ea18cd55fa7093397cad2224ec14.tar.gz qemu-b2312c680084ea18cd55fa7093397cad2224ec14.tar.xz qemu-b2312c680084ea18cd55fa7093397cad2224ec14.zip | |
Merge remote-tracking branch 'remotes/amit-migration/tags/for-juan-201509' into staging
Migration queue
# gpg: Signature made Tue 29 Sep 2015 07:13:55 BST using RSA key ID 854083B6
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg: aka "Amit Shah <amit@kernel.org>"
# gpg: aka "Amit Shah <amitshah@gmx.net>"
* remotes/amit-migration/tags/for-juan-201509:
ram_find_and_save_block: Split out the finding
Move dirty page search state into separate structure
migration: Use g_new() & friends where that makes obvious sense
migration: qemu-file more size_t'ifying
migration: size_t'ify some of qemu-file
Init page sizes in qtest
Split out end of migration code from migration_thread
migration/ram.c: Use RAMBlock rather than MemoryRegion
vmstate: Remove redefinition of VMSTATE_UINT32_ARRAY
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec/memory.h')
0 files changed, 0 insertions, 0 deletions