diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-04-16 15:30:54 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-04-16 15:30:54 +0100 |
| commit | 042f6a31af3d38eefc6ec995cce1d762c41d4515 (patch) | |
| tree | 66506f0ffca39383f96740d4615e8372afad397f /Makefile | |
| parent | aac8f55633f4470e2cb0952bf1a6be3e57d16211 (diff) | |
| parent | 25bf2426f3b27857afa35194227040eab821a047 (diff) | |
| download | qemu-042f6a31af3d38eefc6ec995cce1d762c41d4515.zip qemu-042f6a31af3d38eefc6ec995cce1d762c41d4515.tar.gz qemu-042f6a31af3d38eefc6ec995cce1d762c41d4515.tar.bz2 | |
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>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions