Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20151104' into...
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 5 Nov 2015 10:10:57 +0000 (10:10 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 5 Nov 2015 10:10:57 +0000 (10:10 +0000)
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 <quintela@redhat.com>"
# gpg:                 aka "Juan Quintela <quintela@trasno.org>"

* 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 <peter.maydell@linaro.org>

Trivial merge