diff options
| author | Peter Maydell | 2018-03-30 20:58:17 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-03-30 20:58:17 +0200 |
| commit | 4cd327ded7337c418da114c184cf5868fd980ab4 (patch) | |
| tree | 6f6dbaf375f303d0bf337dcc0c519006d41e1bf5 /include/exec | |
| parent | Merge remote-tracking branch 'remotes/riscv/tags/riscv-qemu-2.12-important-fi... (diff) | |
| parent | migration: Don't activate block devices if using -S (diff) | |
| download | qemu-4cd327ded7337c418da114c184cf5868fd980ab4.tar.gz qemu-4cd327ded7337c418da114c184cf5868fd980ab4.tar.xz qemu-4cd327ded7337c418da114c184cf5868fd980ab4.zip | |
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>
Diffstat (limited to 'include/exec')
0 files changed, 0 insertions, 0 deletions