From: Peter Maydell Date: Tue, 24 May 2016 11:21:07 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/amit-migration/tags/migration-2.7-1' into staging X-Git-Tag: v2.7.0-rc0~170 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99694362ee563c5bbfad92bcc6bd578c0d4f7ce7;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/amit-migration/tags/migration-2.7-1' into staging migration fixes: - ensure src block devices continue fine after a failed migration - fail on migration blockers; helps 9p savevm/loadvm - move autoconverge commands out of experimental state - move the migration-specific qjson in migration/ # gpg: Signature made Mon 23 May 2016 18:15:09 BST using RSA key ID 657EF670 # gpg: Good signature from "Amit Shah " # gpg: aka "Amit Shah " # gpg: aka "Amit Shah " * remotes/amit-migration/tags/migration-2.7-1: migration: regain control of images when migration fails to complete savevm: fail if migration blockers are present migration: Promote improved autoconverge commands out of experimental state migration/qjson: Drop gratuitous use of QOM migration: Move qjson.[ch] to migration/ Signed-off-by: Peter Maydell --- 99694362ee563c5bbfad92bcc6bd578c0d4f7ce7