[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 05/20] block: Introduce bdrv_dirty_bitmap_granula
From: |
John Snow |
Subject: |
[Qemu-block] [PATCH v4 05/20] block: Introduce bdrv_dirty_bitmap_granularity() |
Date: |
Fri, 20 Mar 2015 15:16:48 -0400 |
This returns the granularity (in bytes) of dirty bitmap,
which matches the QMP interface and the existing query
interface.
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
block.c | 8 ++++++--
include/block/block.h | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index c5d68ff..2a590aa 100644
--- a/block.c
+++ b/block.c
@@ -5476,8 +5476,7 @@ BlockDirtyInfoList
*bdrv_query_dirty_bitmaps(BlockDriverState *bs)
BlockDirtyInfo *info = g_new0(BlockDirtyInfo, 1);
BlockDirtyInfoList *entry = g_new0(BlockDirtyInfoList, 1);
info->count = bdrv_get_dirty_count(bs, bm);
- info->granularity =
- ((uint32_t) BDRV_SECTOR_SIZE << hbitmap_granularity(bm->bitmap));
+ info->granularity = bdrv_dirty_bitmap_granularity(bm);
info->has_name = !!bm->name;
info->name = g_strdup(bm->name);
entry->value = info;
@@ -5517,6 +5516,11 @@ uint32_t
bdrv_get_default_bitmap_granularity(BlockDriverState *bs)
return granularity;
}
+uint32_t bdrv_dirty_bitmap_granularity(BdrvDirtyBitmap *bitmap)
+{
+ return BDRV_SECTOR_SIZE << hbitmap_granularity(bitmap->bitmap);
+}
+
void bdrv_dirty_iter_init(BlockDriverState *bs,
BdrvDirtyBitmap *bitmap, HBitmapIter *hbi)
{
diff --git a/include/block/block.h b/include/block/block.h
index 0f014a3..493b7c5 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -459,6 +459,7 @@ void bdrv_dirty_bitmap_make_anon(BlockDriverState *bs,
BdrvDirtyBitmap *bitmap);
void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap);
BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs);
uint32_t bdrv_get_default_bitmap_granularity(BlockDriverState *bs);
+uint32_t bdrv_dirty_bitmap_granularity(BdrvDirtyBitmap *bitmap);
int bdrv_get_dirty(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, int64_t
sector);
void bdrv_set_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap,
int64_t cur_sector, int nr_sectors);
--
2.1.0
- [Qemu-block] [PATCH v4 00/20] block: transactionless incremental backup series, John Snow, 2015/03/20
- [Qemu-block] [PATCH v4 03/20] qmp: Ensure consistent granularity type, John Snow, 2015/03/20
- [Qemu-block] [PATCH v4 06/20] hbitmap: cache array lengths, John Snow, 2015/03/20
- [Qemu-block] [PATCH v4 04/20] qmp: Add block-dirty-bitmap-add and block-dirty-bitmap-remove, John Snow, 2015/03/20
- [Qemu-block] [PATCH v4 07/20] hbitmap: add hbitmap_merge, John Snow, 2015/03/20
- [Qemu-block] [PATCH v4 08/20] block: Add bitmap disabled status, John Snow, 2015/03/20
- [Qemu-block] [PATCH v4 05/20] block: Introduce bdrv_dirty_bitmap_granularity(),
John Snow <=
- [Qemu-block] [PATCH v4 01/20] docs: incremental backup documentation, John Snow, 2015/03/20
- [Qemu-block] [PATCH v4 02/20] qapi: Add optional field "name" to block dirty bitmap, John Snow, 2015/03/20
- [Qemu-block] [PATCH v4 09/20] block: Add bitmap successors, John Snow, 2015/03/20
- [Qemu-block] [PATCH v4 10/20] qmp: Add support of "dirty-bitmap" sync mode for drive-backup, John Snow, 2015/03/20
- [Qemu-block] [PATCH v4 15/20] block: Resize bitmaps on bdrv_truncate, John Snow, 2015/03/20
- [Qemu-block] [PATCH v4 17/20] iotests: add invalid input incremental backup tests, John Snow, 2015/03/20
- [Qemu-block] [PATCH v4 13/20] block: add BdrvDirtyBitmap documentation, John Snow, 2015/03/20
- [Qemu-block] [PATCH v4 18/20] iotests: add QMP event waiting queue, John Snow, 2015/03/20
- [Qemu-block] [PATCH v4 16/20] hbitmap: truncate tests, John Snow, 2015/03/20