[Qemu-commits] [qemu/qemu] a50547: block/qcow2-bitmap: fix bitmap migration

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a505475b95f6fb6667482c0919a53ee53d6a73c7
      
https://github.com/qemu/qemu/commit/a505475b95f6fb6667482c0919a53ee53d6a73c7
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2019-11-26 (Tue, 26 Nov 2019)

  Changed paths:
    M block/qcow2-bitmap.c

  Log Message:
  -----------
  block/qcow2-bitmap: fix bitmap migration

Fix bitmap migration with dirty-bitmaps capability enabled and shared
storage. We should ignore IN_USE bitmaps in the image on target, when
migrating bitmaps through migration channel, see new comment below.

Fixes: 74da6b943565c451
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-id: address@hidden
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: d8130f4c420acafbf15a59436fa47199b82dc00e
      
https://github.com/qemu/qemu/commit/d8130f4c420acafbf15a59436fa47199b82dc00e
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2019-11-26 (Tue, 26 Nov 2019)

  Changed paths:
    M tests/qemu-iotests/169
    M tests/qemu-iotests/169.out

  Log Message:
  -----------
  iotests: add new test cases to bitmap migration

Add optional pre-shutdown: shutdown/launch vm before migration. This
leads to storing persistent bitmap to the storage, which breaks
migration with dirty-bitmaps capability enabled and shared storage
until fixed by previous commit.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-id: address@hidden
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 0d4f9d7dc7832a876f4a71138325c0fcefd587b6
      
https://github.com/qemu/qemu/commit/0d4f9d7dc7832a876f4a71138325c0fcefd587b6
  Author: Peter Maydell <address@hidden>
  Date:   2019-11-26 (Tue, 26 Nov 2019)

  Changed paths:
    M block/qcow2-bitmap.c
    M tests/qemu-iotests/169
    M tests/qemu-iotests/169.out

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-11-26' 
into staging

Block patches for 4.2.0-rc3:
- Fix for shared storage migration with persistent dirty bitmaps

# gpg: Signature made Tue 26 Nov 2019 13:27:32 GMT
# gpg:                using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40
# gpg:                issuer "address@hidden"
# gpg: Good signature from "Max Reitz <address@hidden>" [full]
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/maxreitz/tags/pull-block-2019-11-26:
  iotests: add new test cases to bitmap migration
  block/qcow2-bitmap: fix bitmap migration

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/a0aaca7e9cd9...0d4f9d7dc783