[Qemu-commits] [qemu/qemu] e77c8b: Update version for v6.1.0-rc0 release

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: e77c8b8b8e933414ef07dbed04e02973fccffeb0
      
https://github.com/qemu/qemu/commit/e77c8b8b8e933414ef07dbed04e02973fccffeb0
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-07-21 (Wed, 21 Jul 2021)

  Changed paths:
    M VERSION

  Log Message:
  -----------
  Update version for v6.1.0-rc0 release

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: 94075c28eea0755173939dfaf1eae688b224a74e
      
https://github.com/qemu/qemu/commit/94075c28eea0755173939dfaf1eae688b224a74e
  Author: Eric Blake <eblake@redhat.com>
  Date:   2021-07-21 (Wed, 21 Jul 2021)

  Changed paths:
    M block/dirty-bitmap.c
    R tests/qemu-iotests/291
    R tests/qemu-iotests/291.out
    A tests/qemu-iotests/tests/qemu-img-bitmaps
    A tests/qemu-iotests/tests/qemu-img-bitmaps.out

  Log Message:
  -----------
  iotests: Improve and rename test 291 to qemu-img-bitmap

Enhance the test to demonstrate existing less-than-stellar behavior of
qemu-img with a qcow2 image containing an inconsistent bitmap: we
don't diagnose the problem until after copying the entire image (a
potentially long time), and when we do diagnose the failure, we still
end up leaving an empty bitmap in the destination.  This mess will be
cleaned up in the next patch.

While at it, rename the test now that we support useful iotest names,
and fix a missing newline in the error message thus exposed.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210709153951.2801666-2-eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Nir Soffer <nsoffer@redhat.com>


  Commit: 74a4320f30632fa539507861b3835698282e462e
      
https://github.com/qemu/qemu/commit/74a4320f30632fa539507861b3835698282e462e
  Author: Eric Blake <eblake@redhat.com>
  Date:   2021-07-21 (Wed, 21 Jul 2021)

  Changed paths:
    M qemu-img.c
    M tests/qemu-iotests/tests/qemu-img-bitmaps
    M tests/qemu-iotests/tests/qemu-img-bitmaps.out

  Log Message:
  -----------
  qemu-img: Fail fast on convert --bitmaps with inconsistent bitmap

Waiting until the end of the convert operation (a potentially
time-consuming task) to finally detect that we can't copy a bitmap is
bad, comparing to failing fast up front.  Furthermore, this prevents
us from leaving a file behind with a bitmap that is not marked as
inconsistent even though it does not have sane contents.

This fixes the problems exposed in the previous patch to the iotest:
it adds a fast failure up front, and even if we don't fail early, it
ensures that any bitmap we add but do not properly populate is removed
again rather than left behind incomplete.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210709153951.2801666-3-eblake@redhat.com>
[eblake: add a hint to the warning message, simplify name computation]
Reviewed-by: Nir Soffer <nsoffer@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>


  Commit: 955171e4417bf39edb5503e694501e082a757731
      
https://github.com/qemu/qemu/commit/955171e4417bf39edb5503e694501e082a757731
  Author: Eric Blake <eblake@redhat.com>
  Date:   2021-07-21 (Wed, 21 Jul 2021)

  Changed paths:
    M docs/tools/qemu-img.rst
    M qemu-img.c
    M tests/qemu-iotests/tests/qemu-img-bitmaps
    M tests/qemu-iotests/tests/qemu-img-bitmaps.out

  Log Message:
  -----------
  qemu-img: Add --skip-broken-bitmaps for 'convert --bitmaps'

The point of 'qemu-img convert --bitmaps' is to be a convenience for
actions that are already possible through a string of smaller
'qemu-img bitmap' sub-commands.  One situation not accounted for
already is that if a source image contains an inconsistent bitmap (for
example, because a qemu process died abruptly before flushing bitmap
state), the user MUST delete those inconsistent bitmaps before
anything else useful can be done with the image.

We don't want to delete inconsistent bitmaps by default: although a
corrupt bitmap is only a loss of optimization rather than a corruption
of user-visible data, it is still nice to require the user to opt in
to the fact that they are aware of the loss of the bitmap.  Still,
requiring the user to check 'qemu-img info' to see whether bitmaps are
consistent, then use 'qemu-img bitmap --remove' to remove offenders,
all before using 'qemu-img convert', is a lot more work than just
adding a knob 'qemu-img convert --bitmaps --skip-broken-bitmaps' which
opts in to skipping the broken bitmaps.

After testing the new option, also demonstrate the way to manually fix
things (either deleting bad bitmaps, or re-creating them as empty) so
that it is possible to convert without the option.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1946084
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210709153951.2801666-4-eblake@redhat.com>
[eblake: warning message tweak, test enhancements]
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>


  Commit: 423a4849db5244f9af152e3b69c5e0715f2ee7a5
      
https://github.com/qemu/qemu/commit/423a4849db5244f9af152e3b69c5e0715f2ee7a5
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-07-22 (Thu, 22 Jul 2021)

  Changed paths:
    M block/dirty-bitmap.c
    M docs/tools/qemu-img.rst
    M qemu-img.c
    R tests/qemu-iotests/291
    R tests/qemu-iotests/291.out
    A tests/qemu-iotests/tests/qemu-img-bitmaps
    A tests/qemu-iotests/tests/qemu-img-bitmaps.out

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ericb/tags/pull-bitmaps-2021-07-21' 
into staging

block bitmaps patches for 2021-07-21

- fix 'qemu-img convert --bitmaps' handling of qcow2 files with
  inconsistent bitmaps

# gpg: Signature made Wed 21 Jul 2021 20:16:09 BST
# gpg:                using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) 
<ebb9@byu.net>" [full]
# gpg:                 aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-bitmaps-2021-07-21:
  qemu-img: Add --skip-broken-bitmaps for 'convert --bitmaps'
  qemu-img: Fail fast on convert --bitmaps with inconsistent bitmap
  iotests: Improve and rename test 291 to qemu-img-bitmap

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/29c7daa00722...423a4849db52