OSDN Git Service

Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 30 May 2019 11:10:27 +0000 (12:10 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 30 May 2019 11:10:27 +0000 (12:10 +0100)
commit62f6849e7a74fe34f5e376fe41389298100a2d1e
treef48c4c7a51a2e03df7ae4e0f32adf36b770f3497
parente5714b5be3d63d880844f004bd3c76170a280069
parent403bb8185ec18267fe47a0e304d26a17263572dc
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>
blockdev.c
qapi/block-core.json