On 16 April 2018 at 13:38, Max Reitz <mre...@redhat.com> wrote: > The following changes since commit ae2b1b4e1bb89ea949446597c8776255da0a79d3: > > Merge remote-tracking branch > 'remotes/vivier/tags/m68k-for-2.12-pull-request' into staging (2018-04-16 > 10:11:17 +0100) > > are available in the Git repository at: > > git://github.com/XanClic/qemu.git tags/pull-block-2018-04-16 > > for you to fetch changes up to 25bf2426f3b27857afa35194227040eab821a047: > > iotests: fix 169 (2018-04-16 13:35:32 +0200) > > ---------------------------------------------------------------- > A fix for handling dirty bitmaps stored in qcow2 files. This is not > absolutely necessary for 2.12, but if there is an rc4, it should go in. > > ---------------------------------------------------------------- > Vladimir Sementsov-Ogievskiy (2): > qcow2: try load bitmaps only once > iotests: fix 169 > > block/qcow2.h | 1 + > block/qcow2.c | 16 ++++++++-------- > tests/qemu-iotests/169 | 48 +++++++++++++++++++++++++++--------------------- > 3 files changed, 36 insertions(+), 29 deletions(-)
Applied, thanks. -- PMM