| commit | 4cd327ded7337c418da114c184cf5868fd980ab4 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 30 Mar 2018 18:58:17 +0000 (30 19:58 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 30 Mar 2018 18:58:17 +0000 (30 19:58 +0100) | ||
| tree | 6f6dbaf375f303d0bf337dcc0c519006d41e1bf5 | treesnapshot (tar.gz zip) |
| parent | 47d3b60858d90ac8a0cc3a72af7f95c96781125a | commitdiff |
| parent | 0746a92612276aee69e66dfe6782b0f882d221d5 | commitdiff |
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) <dgilbert@redhat.com>"
# 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 <peter.maydell@linaro.org>
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) <dgilbert@redhat.com>"
# 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 <peter.maydell@linaro.org>