tree 930bba961509c5295c3fbad13cbd4377122831e9
parent 6a5d22083d50c76a3fdc0bffc6658f42b3b37981
parent b7cd2c11f76d27930f53d3cf26d7b695c78d613b
author Peter Maydell <peter.maydell@linaro.org> 1573146813 +0000
committer Peter Maydell <peter.maydell@linaro.org> 1573146813 +0000
mergetag object b7cd2c11f76d27930f53d3cf26d7b695c78d613b
 type commit
 tag pull-block-2019-11-07
 tagger Max Reitz <mreitz@redhat.com> 1573136971 +0100
 
 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
 -----BEGIN PGP SIGNATURE-----
 
 iQFGBAABCAAwFiEEkb62CjDbPohX0Rgp9AfbAGHVz0AFAl3EKqASHG1yZWl0ekBy
 ZWRoYXQuY29tAAoJEPQH2wBh1c9AnmQH/RwRP40NAgcoDHG8iQRuGBvRZzi4blb+
 +N0b4WKW35okn8BsDDcdbiM6seTPVq2Mn08mM4Fb9XNfzpiXPBdy7su/PvUNH0vX
 PLK9CqSDKDluRpvGYGn9ZMZSKRrEKtLKfNdMitS+nl6MxFboqK3VUCsMaJmXkFrz
 8Ele4scU1cj/pFGO+DNTWxCcwEYbeeuouzAsLZK6bSkgffb8Th+nM8cDEJfrpgS2
 X3hGs3T5pQIzFyDTfOXPWWVVmwsBsFIO4WrnDdITdhiyKofnKH+fG6uRsv9kQsE6
 yaL6iRTJA24w+AZhRkgWFj8Au4u9g9pksPchnw5+DvJYW9KZfoRPv5Q=
 =6MtT
 -----END PGP SIGNATURE-----

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>