From: Eric Blake Date: Fri, 21 Jul 2017 18:32:42 +0000 (-0500) Subject: dirty-bitmap: Report BlockDirtyInfo.count in bytes, as documented X-Git-Tag: v2.9.1~108 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4aa16db9cf4219c0bb4fa0291349eb5d26c34a06;p=thirdparty%2Fqemu.git dirty-bitmap: Report BlockDirtyInfo.count in bytes, as documented 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: qemu-stable@nongnu.org Signed-off-by: Eric Blake Reviewed-by: John Snow Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf (cherry picked from commit 6c98c57af3f4fab85bdf5f01616c91322bd4312a) Signed-off-by: Michael Roth --- diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 519737c8d39..6d8ce5fabdc 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -345,7 +345,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);