diff options
| author | Peter Maydell | 2018-06-12 14:33:23 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-12 14:33:23 +0200 |
| commit | 98d11a6e72c4c4524f9623a165d081da65936269 (patch) | |
| tree | 6291f71a9d2c55f561b750e6ee751506ae588d63 /include | |
| parent | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff) | |
| parent | qapi: add disabled parameter to block-dirty-bitmap-add (diff) | |
| download | qemu-98d11a6e72c4c4524f9623a165d081da65936269.tar.gz qemu-98d11a6e72c4c4524f9623a165d081da65936269.tar.xz qemu-98d11a6e72c4c4524f9623a165d081da65936269.zip | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/dirty-bitmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h index 1ff8949b1b..02e0cbabd2 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -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); |