Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-11-07' into staging
commitf14c8b1b0d6381ac3abd36993c3244e7f9b12301
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 7 Nov 2019 17:13:33 +0000 (7 17:13 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 7 Nov 2019 17:13:33 +0000 (7 17:13 +0000)
tree930bba961509c5295c3fbad13cbd4377122831e9
parent6a5d22083d50c76a3fdc0bffc6658f42b3b37981
parentb7cd2c11f76d27930f53d3cf26d7b695c78d613b
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-11-07' into staging

Block patches for 4.2.0-rc0/4.1.1:
- Fix writing to compressed qcow2 images > 4 GB
- Fix size sanity check for qcow2 bitmaps

# gpg: Signature made Thu 07 Nov 2019 14:30:56 GMT
# gpg:                using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40
# gpg:                issuer "mreitz@redhat.com"
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>" [full]
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/maxreitz/tags/pull-block-2019-11-07:
  iotests: Add test for 4G+ compressed qcow2 write
  qcow2: Fix QCOW2_COMPRESSED_SECTOR_MASK
  qcow2-bitmap: Fix uint64_t left-shift overflow

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