From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 30 May 2019 11:10:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging
X-Git-Tag: v4.1.0-rc0~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62f6849e7a74fe34f5e376fe41389298100a2d1e;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging

Pull request

# gpg: Signature made Wed 29 May 2019 00:58:33 BST
# gpg:                using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jnsnow/tags/bitmaps-pull-request:
  iotests: test external snapshot with bitmap copying
  qapi: support external bitmaps in block-dirty-bitmap-merge
  migration/dirty-bitmaps: change bitmap enumeration method

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

62f6849e7a74fe34f5e376fe41389298100a2d1e