From: Peter Maydell Date: Fri, 30 Mar 2018 18:58:17 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180329a' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4cd327ded7337c418da114c184cf5868fd980ab4;p=qemu.git Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180329a' into staging Migration pull (small fixes) A pair of two small fixes for 2.12. # gpg: Signature made Thu 29 Mar 2018 14:55:17 BST # 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-20180329a: migration: Don't activate block devices if using -S migration: fix pfd leak Signed-off-by: Peter Maydell --- 4cd327ded7337c418da114c184cf5868fd980ab4