The following changes since commit 234afe78281b10a798fb97c584e1b677844aaab8:
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-03-08' into staging (2019-03-08 16:31:34 +0000) are available in the Git repository at: https://github.com/jnsnow/qemu.git tags/bitmaps-pull-request for you to fetch changes up to fc91aa3d937e56d512c702d9b966fcea0e499f0e: block/dirty-bitmaps: implement inconsistent bit (2019-03-08 14:07:29 -0500) ---------------------------------------------------------------- Pull request ---------------------------------------------------------------- John Snow (17): block/dirty-bitmap: add recording and busy properties block/dirty-bitmaps: rename frozen predicate helper block/dirty-bitmap: remove set/reset assertions against enabled bit block/dirty-bitmap: change semantics of enabled predicate nbd: change error checking order for bitmaps block/dirty-bitmap: explicitly lock bitmaps with successors block/dirty-bitmaps: unify qmp_locked and user_locked calls block/dirty-bitmaps: move comment block blockdev: remove unused paio parameter documentation iotests: add busy/recording bit test to 124 block/dirty-bitmaps: add inconsistent bit block/dirty-bitmap: add inconsistent status block/dirty-bitmaps: add block_dirty_bitmap_check function block/dirty-bitmaps: prohibit readonly bitmaps for backups block/dirty-bitmaps: prohibit removing readonly bitmaps block/dirty-bitmaps: disallow busy bitmaps as merge source block/dirty-bitmaps: implement inconsistent bit qemu-deprecated.texi | 6 ++ qapi/block-core.json | 28 +++++- include/block/dirty-bitmap.h | 20 +++- block/dirty-bitmap.c | 169 ++++++++++++++++++++++----------- block/qcow2-bitmap.c | 103 ++++++++++---------- blockdev.c | 51 ++-------- migration/block-dirty-bitmap.c | 18 ++-- nbd/server.c | 13 ++- tests/qemu-iotests/124 | 113 ++++++++++++++++++++++ tests/qemu-iotests/124.out | 4 +- tests/qemu-iotests/236.out | 28 ++++++ 11 files changed, 377 insertions(+), 176 deletions(-) -- 2.17.2
