bitmaps pull request

-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJbHs51AAoJEH3vgQaq/DkOgUwP/3KugXgtQWmg4SO4w5XZpxz+
 q19BKrAJxbgKGrb5vGqQ6GBvORTdN2cdgHeOgHARaeOYy3WUiZOOwaktRHVWWG3k
 EpfPmlAeNYoSrXNMuebvCIDjhqf3XnPQ1DKalU9Al7EXrWkKLGO5bTpJtFXZ2bnh
 UCPlfkaibhJqiZ4LrqzGvdPlCjVjby32s8enzRjV9J1OfZQ5SndPz9txZ+jSd0Ta
 mvJsNQtdWFyhTzu/I8Nz7Hf+IpcQ65jlkk52W+d2zYBVC3SW/l5sEKHD0MILULtx
 C5EobPB7l48hZly5EBc2leR+ckbQ04yjrSgD6tJ6Dcu/ryxXe3un137TBsWNzsbu
 Ngmg4JQZ6Az4o8xREBVNulT2gX4qR9gq73RvkigXV9rU3VQR2EWT229Tsgw9dnGk
 iURrb2aa59T/mu2vYR126aqB7VtSO5YRwwjME6Esx5J1qQqJSQliu7Ar93v28uYF
 XwsVYY6brHuvp5fMmPadnldudCuSaHYFWS07u8KCMRrcsmV1MQIMEbwASPpENLrn
 B2gi05XC7vAl5mFQegSSf9aHzAjTAUsgDgaOhGKK2PpPsI8Z9ZICllqCOEQ+S0/4
 KOwXcMhmMTGIjKnBSSROQOMhYzxsEvvn4O8W1v1PLmqcUyLRCPMOe2UgZedEu5zy
 eu0GErzWdwr+N4heaAPZ
 =0Au5
 -----END PGP SIGNATURE-----

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

bitmaps pull request

# gpg: Signature made Mon 11 Jun 2018 20:33:09 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:
  qapi: add disabled parameter to block-dirty-bitmap-add
  qapi: add x-block-dirty-bitmap-merge
  qmp: transaction support for x-block-dirty-bitmap-enable/disable
  qapi: add x-block-dirty-bitmap-enable/disable
  block/dirty-bitmap: add lock to bdrv_enable/disable_dirty_bitmap
  block: simplify code around releasing bitmaps
  block: remove bdrv_dirty_bitmap_make_anon

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-06-12 13:33:23 +01:00
commit 98d11a6e72
5 changed files with 307 additions and 68 deletions

View file

@ -24,7 +24,6 @@ BdrvDirtyBitmap *bdrv_reclaim_dirty_bitmap(BlockDriverState *bs,
void bdrv_dirty_bitmap_enable_successor(BdrvDirtyBitmap *bitmap);
BdrvDirtyBitmap *bdrv_find_dirty_bitmap(BlockDriverState *bs,
const char *name);
void bdrv_dirty_bitmap_make_anon(BdrvDirtyBitmap *bitmap);
void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap);
void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs);
void bdrv_release_persistent_dirty_bitmaps(BlockDriverState *bs);
@ -70,7 +69,8 @@ void bdrv_dirty_bitmap_set_readonly(BdrvDirtyBitmap *bitmap, bool value);
void bdrv_dirty_bitmap_set_persistance(BdrvDirtyBitmap *bitmap,
bool persistent);
void bdrv_dirty_bitmap_set_qmp_locked(BdrvDirtyBitmap *bitmap, bool qmp_locked);
void bdrv_merge_dirty_bitmap(BdrvDirtyBitmap *dest, const BdrvDirtyBitmap *src,
Error **errp);
/* Functions that require manual locking. */
void bdrv_dirty_bitmap_lock(BdrvDirtyBitmap *bitmap);