From: Peter Maydell Date: Thu, 5 Nov 2015 10:10:57 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20151104' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6c5f30cad290c745f910481d0e890b3f4fad1f00;p=qemu.git Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20151104' into staging migration/next for 20151104 # gpg: Signature made Wed 04 Nov 2015 12:45:19 GMT using RSA key ID 5872D723 # gpg: Good signature from "Juan Quintela " # gpg: aka "Juan Quintela " * remotes/juanquintela/tags/migration/20151104: migration: fix analyze-migration.py script migration: code clean up migration: rename cancel to cleanup in SaveVMHandles migration: rename qemu_savevm_state_cancel migration: defer migration_end & blk_mig_cleanup Signed-off-by: Peter Maydell --- 6c5f30cad290c745f910481d0e890b3f4fad1f00