From: Peter Maydell Date: Fri, 26 Feb 2016 15:21:26 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.6-5' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=aa53d5bfc35d73099184bdd1c538591a5f795c9e;p=qemu.git Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.6-5' into staging migration pull - fix a qcow2 assert - fix for older distros (CentOS 5) - documentation for vmstate flags - minor code rearrangement # gpg: Signature made Fri 26 Feb 2016 15:15:15 GMT using RSA key ID 854083B6 # gpg: Good signature from "Amit Shah " # gpg: aka "Amit Shah " # gpg: aka "Amit Shah " * remotes/amit-migration/tags/migration-for-2.6-5: migration (postcopy): move bdrv_invalidate_cache_all of of coroutine context migration (ordinary): move bdrv_invalidate_cache_all of of coroutine context migration/vmstate: document VMStateFlags MAINTAINERS: Add docs/migration.txt to the "Migration" section migration/postcopy-ram: Guard use of sys/eventfd.h with CONFIG_EVENTFD migration: reorder code to make it symmetric Signed-off-by: Peter Maydell --- aa53d5bfc35d73099184bdd1c538591a5f795c9e