From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1zVn-0001kP-Ox for qemu-devel@nongnu.org; Mon, 08 Jun 2015 12:02:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z1zVj-0001CU-OI for qemu-devel@nongnu.org; Mon, 08 Jun 2015 12:02:55 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:38531 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1zVj-00018U-Ai for qemu-devel@nongnu.org; Mon, 08 Jun 2015 12:02:51 -0400 From: Vladimir Sementsov-Ogievskiy Date: Mon, 8 Jun 2015 18:21:22 +0300 Message-Id: <1433776886-27239-5-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1433776886-27239-1-git-send-email-vsementsov@virtuozzo.com> References: <1433776886-27239-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 4/8] block: add bdrv_load_dirty_bitmap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, Vladimir Sementsov-Ogievskiy , stefanha@redhat.com, pbonzini@redhat.com, den@openvz.org, jsnow@redhat.com From: Vladimir Sementsov-Ogievskiy The funcion loads dirty bitmap from file, using underlying driver function. Note: the function doesn't change BdrvDirtyBitmap.file field. This field is only used by bdrv_store_dirty_bitmap() function and is ONLY written by bdrv_dirty_bitmap_set_file() function. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block.c | 37 +++++++++++++++++++++++++++++++++++++ include/block/block.h | 5 +++++ 2 files changed, 42 insertions(+) diff --git a/block.c b/block.c index 74d4edc..6230717 100644 --- a/block.c +++ b/block.c @@ -3109,6 +3109,43 @@ void bdrv_release_meta_bitmap(BdrvDirtyBitmap *bitmap) } } +BdrvDirtyBitmap *bdrv_load_dirty_bitmap(BlockDriverState *bs, + BlockDriverState *file, + int granularity, + const char *name, + Error **errp) +{ + BlockDriver *drv = file->drv; + if (!drv) { + return NULL; + } + if (drv->bdrv_dirty_bitmap_load) { + BdrvDirtyBitmap *bitmap; + uint64_t bitmap_size = bdrv_nb_sectors(bs); + uint8_t *buf = drv->bdrv_dirty_bitmap_load(file, name, bitmap_size, + granularity); + if (buf == NULL) { + return NULL; + } + + bitmap = bdrv_create_dirty_bitmap(bs, granularity, name, errp); + if (bitmap == NULL) { + g_free(buf); + return NULL; + } + + hbitmap_deserialize_part(bitmap->bitmap, buf, 0, bitmap_size); + hbitmap_deserialize_finish(bitmap->bitmap); + + return bitmap; + } + if (file->file) { + return bdrv_load_dirty_bitmap(bs, file->file, granularity, name, + errp); + } + return NULL; +} + int bdrv_store_dirty_bitmap(BdrvDirtyBitmap *bitmap) { BlockDriverState *bs = bitmap->file; diff --git a/include/block/block.h b/include/block/block.h index 6e82597..fcdb0f3 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -508,6 +508,11 @@ HBitmap *bdrv_create_meta_bitmap(BdrvDirtyBitmap *bitmap, uint64_t granularity); void bdrv_release_meta_bitmap(BdrvDirtyBitmap *bitmap); +BdrvDirtyBitmap *bdrv_load_dirty_bitmap(BlockDriverState *bs, + BlockDriverState *file, + int granularity, + const char *name, + Error **errp); int bdrv_store_dirty_bitmap(BdrvDirtyBitmap *bitmap); void bdrv_enable_copy_on_read(BlockDriverState *bs); -- 1.9.1