[Qemu-commits] [qemu/qemu] a18a73: Revert "migration: Don't activate block devices if...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a18a73d7472e6ff5bc1e5f7fb9f7a42464295d03
      
https://github.com/qemu/qemu/commit/a18a73d7472e6ff5bc1e5f7fb9f7a42464295d03
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  Revert "migration: Don't activate block devices if using -S"

This reverts commit 0746a92612276aee69e66dfe6782b0f882d221d5.
Discussion with kwolf suggests this is actually an API change that
we need to gate on a capability.  Push to 2.13.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>


  Commit: ac4ba87ae0738d7a77708f8ce31ae2378ab99654
      
https://github.com/qemu/qemu/commit/ac4ba87ae0738d7a77708f8ce31ae2378ab99654
  Author: Peter Maydell <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  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) <address@hidden>"
# 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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/26d6a7c87b05...ac4ba87ae073