]> git.ipfire.org Git - thirdparty/qemu.git/commit - target/s390x/cpu_features.c
Merge remote-tracking branch 'remotes/ericb/tags/pull-bitmaps-2020-10-26' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 26 Oct 2020 22:36:34 +0000 (22:36 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 26 Oct 2020 22:36:35 +0000 (22:36 +0000)
commit091e3e3dbc499d84c004e1c50bc9870af37f6e99
tree73de2336b2a506d99bdd2c6525bc978fa8c563fa
parent1dc887329a10903940501b43e8c0cc67af7c06d5
parenta024890a64085d3d37ad7eda164775251285c14c
Merge remote-tracking branch 'remotes/ericb/tags/pull-bitmaps-2020-10-26' into staging

bitmaps patches for 2020-10-26

- fix infloop on large bitmap granularity
- silence compiler warning

# gpg: Signature made Mon 26 Oct 2020 11:56:54 GMT
# gpg:                using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full]
# gpg:                 aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-bitmaps-2020-10-26:
  migration/block-dirty-bitmap: fix uninitialized variable warning
  migration/block-dirty-bitmap: fix larger granularity bitmaps

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