From: Peter Maydell Date: Fri, 22 Jul 2016 09:51:31 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.7-6' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e3643d32ee805d8a7b248526a507452c484a98e5;p=qemu.git Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.7-6' into staging Migration: - Fix a postcopy bug - Add a testsuite for measuring migration performance # gpg: Signature made Fri 22 Jul 2016 08:56:44 BST # gpg: using RSA key 0xEB0B4DFC657EF670 # gpg: Good signature from "Amit Shah " # gpg: aka "Amit Shah " # gpg: aka "Amit Shah " # Primary key fingerprint: 48CA 3722 5FE7 F4A8 B337 2735 1E9A 3B5F 8540 83B6 # Subkey fingerprint: CC63 D332 AB8F 4617 4529 6534 EB0B 4DFC 657E F670 * remotes/amit-migration/tags/migration-for-2.7-6: tests: introduce a framework for testing migration performance scripts: ensure monitor socket has SO_REUSEADDR set scripts: set timeout when waiting for qemu monitor connection scripts: refactor the VM class in iotests for reuse scripts: add a 'debug' parameter to QEMUMonitorProtocol scripts: add __init__.py file to scripts/qmp/ migration: set state to post-migrate on failure Signed-off-by: Peter Maydell --- e3643d32ee805d8a7b248526a507452c484a98e5