diff options
| author | Peter Maydell | 2018-04-11 00:42:14 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-04-11 00:42:14 +0200 |
| commit | ac4ba87ae0738d7a77708f8ce31ae2378ab99654 (patch) | |
| tree | fdc416a63bfef6d11b2de4bb314fb6a21b4f4d77 /accel/tcg/cpu-exec-common.c | |
| parent | Merge remote-tracking branch 'remotes/ericb/tags/pull-qapi-2018-04-10' into s... (diff) | |
| parent | Revert "migration: Don't activate block devices if using -S" (diff) | |
| download | qemu-ac4ba87ae0738d7a77708f8ce31ae2378ab99654.tar.gz qemu-ac4ba87ae0738d7a77708f8ce31ae2378ab99654.tar.xz qemu-ac4ba87ae0738d7a77708f8ce31ae2378ab99654.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180410a' into staging
Migration reversion pull for 2.12
One to revert after we decided it needs some more thinking.
# gpg: Signature made Tue 10 Apr 2018 16:02: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-20180410a:
Revert "migration: Don't activate block devices if using -S"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'accel/tcg/cpu-exec-common.c')
0 files changed, 0 insertions, 0 deletions