From: Peter Maydell Date: Tue, 29 Sep 2015 11:41:19 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/amit-migration/tags/for-juan-201509' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b2312c680084ea18cd55fa7093397cad2224ec14;p=qemu.git 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 " # gpg: aka "Amit Shah " # gpg: aka "Amit Shah " * 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 --- b2312c680084ea18cd55fa7093397cad2224ec14