From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 16 Apr 2018 14:30:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2018-04-16' into staging
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=042f6a31af3d38eefc6ec995cce1d762c41d4515;p=people%2Fpauldu%2Fqemu.git

Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2018-04-16' into staging

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.

# gpg: Signature made Mon 16 Apr 2018 13:35:08 BST
# gpg:                using RSA key F407DB0061D5CF40
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/maxreitz/tags/pull-block-2018-04-16:
  iotests: fix 169
  qcow2: try load bitmaps only once

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

042f6a31af3d38eefc6ec995cce1d762c41d4515