[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 01/11] dirty-bitmap: Report BlockDirtyInfo.count
From: |
Eric Blake |
Subject: |
[Qemu-block] [PATCH v3 01/11] dirty-bitmap: Report BlockDirtyInfo.count in bytes, as documented |
Date: |
Wed, 28 Jun 2017 12:55:24 -0500 |
We've been documenting the value in bytes since its introduction
in commit b9a9b3a4 (v1.3), where it was actually reported in bytes.
Commit e4654d2 (v2.0) then removed things from block/qapi.c, in
preparation for a rewrite to a list of dirty sectors in the next
commit 21b5683 in block.c, but the new code mistakenly started
reporting in sectors.
Fixes: https://bugzilla.redhat.com/1441460
CC: address@hidden
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: John Snow <address@hidden>
---
Too late for 2.9, since the regression has been unnoticed for
nine releases. But worth putting in 2.9.1.
v2: no change
---
block/dirty-bitmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index a04c6e4..f17fc14 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -410,7 +410,7 @@ BlockDirtyInfoList
*bdrv_query_dirty_bitmaps(BlockDriverState *bs)
QLIST_FOREACH(bm, &bs->dirty_bitmaps, list) {
BlockDirtyInfo *info = g_new0(BlockDirtyInfo, 1);
BlockDirtyInfoList *entry = g_new0(BlockDirtyInfoList, 1);
- info->count = bdrv_get_dirty_count(bm);
+ info->count = bdrv_get_dirty_count(bm) << BDRV_SECTOR_BITS;
info->granularity = bdrv_dirty_bitmap_granularity(bm);
info->has_name = !!bm->name;
info->name = g_strdup(bm->name);
--
2.9.4
- [Qemu-block] [PATCH v3 00/11] make dirty-bitmap byte-based, Eric Blake, 2017/06/28
- [Qemu-block] [PATCH v3 01/11] dirty-bitmap: Report BlockDirtyInfo.count in bytes, as documented,
Eric Blake <=
- [Qemu-block] [PATCH v3 02/11] dirty-bitmap: Drop unused functions, Eric Blake, 2017/06/28
- [Qemu-block] [PATCH v3 03/11] dirty-bitmap: Track size in bytes, Eric Blake, 2017/06/28
- [Qemu-block] [PATCH v3 04/11] dirty-bitmap: Set iterator start by offset, not sector, Eric Blake, 2017/06/28
- [Qemu-block] [PATCH v3 05/11] dirty-bitmap: Change bdrv_dirty_iter_next() to report byte offset, Eric Blake, 2017/06/28
- [Qemu-block] [PATCH v3 07/11] dirty-bitmap: Change bdrv_get_dirty_locked() to take bytes, Eric Blake, 2017/06/28
- [Qemu-block] [PATCH v3 06/11] dirty-bitmap: Change bdrv_get_dirty_count() to report bytes, Eric Blake, 2017/06/28
- [Qemu-block] [PATCH v3 08/11] dirty-bitmap: Change bdrv_[re]set_dirty_bitmap() to use bytes, Eric Blake, 2017/06/28
- [Qemu-block] [PATCH v3 09/11] mirror: Switch mirror_dirty_init() to byte-based iteration, Eric Blake, 2017/06/28
- [Qemu-block] [PATCH v3 10/11] dirty-bitmap: Switch bdrv_set_dirty() to bytes, Eric Blake, 2017/06/28
- [Qemu-block] [PATCH v3 11/11] dirty-bitmap: Convert internal hbitmap size/granularity, Eric Blake, 2017/06/28