From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 5 Jul 2018 12:33:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6cf495be0b445789eeb7e88a6015c8cf74d4c1cf;p=qemu.git

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

Pull request

# gpg: Signature made Wed 04 Jul 2018 07:33:42 BST
# gpg:                using RSA key 7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# 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:
  dirty-bitmap: fix double lock on bitmap enabling
  block/dirty-bitmap: add bdrv_enable_dirty_bitmap_locked

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

6cf495be0b445789eeb7e88a6015c8cf74d4c1cf