From: Peter Maydell Date: Mon, 12 Mar 2018 13:21:53 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180309a' into... X-Git-Tag: qemu-xen-4.12.0-rc1~394 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=819fd4699c7b36d574292bcbd8bc25e9d716c84b;p=qemu-xen.git Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180309a' into staging Migration pull 2018-03-09 # gpg: Signature made Fri 09 Mar 2018 17:52:46 GMT # gpg: using RSA key 0516331EBC5BFDE7 # gpg: Good signature from "Dr. David Alan Gilbert (RH2) " # Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7 * remotes/dgilbert/tags/pull-migration-20180309a: tests: Silence migration-test 'bad' test migration: fix applying wrong capabilities migration/block: rename MAX_INFLIGHT_IO to MAX_IO_BUFFERS migration/block: reset dirty bitmap before read in bulk phase migration: do not transfer ram during bulk storage migration migration: fix minor finalize leak Signed-off-by: Peter Maydell --- 819fd4699c7b36d574292bcbd8bc25e9d716c84b