From: Peter Maydell Date: Thu, 16 Jun 2016 09:53:33 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.7-4' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a66370b08d53837eb233cad090b3c2638084cc44;p=qemu.git Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.7-4' into staging Migration: - Fixes for TLS series - Postcopy: Add stats, fix, test case # gpg: Signature made Thu 16 Jun 2016 05:40:09 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-4: migration: rename functions to starting migrations migration: fix typos in qapi-schema from latest migration additions Postcopy: Check for support when setting the capability tests: fix libqtest socket timeouts test: Postcopy Postcopy: Add stats on page requests Migration: Split out ram part of qmp_query_migrate Postcopy: Avoid 0 length discards Signed-off-by: Peter Maydell --- a66370b08d53837eb233cad090b3c2638084cc44