Received: from eggs.gnu.org ([2001:4830:134:3::10]:38931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afvDo-0008MO-V3 for qemu-devel@nongnu.org; Tue, 15 Mar 2016 16:05:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afvDi-0008Jh-Uz for qemu-devel@nongnu.org; Tue, 15 Mar 2016 16:05:40 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:26394 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afvDi-0008II-JP for qemu-devel@nongnu.org; Tue, 15 Mar 2016 16:05:34 -0400 From: Vladimir Sementsov-Ogievskiy Date: Tue, 15 Mar 2016 23:04:20 +0300 Message-Id: <1458072268-53705-15-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1458072268-53705-1-git-send-email-vsementsov@virtuozzo.com> References: <1458072268-53705-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 14/22] 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, famz@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, den@openvz.org, jsnow@redhat.com 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/dirty-bitmap.c | 16 ++++++++++++++++ include/block/dirty-bitmap.h | 2 ++ 2 files changed, 18 insertions(+) diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index c9e999f..87ee4d7 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -469,3 +469,19 @@ void bdrv_finalize_persistent_dirty_bitmaps(BlockDriverState *bs) } } } + +BdrvDirtyBitmap *bdrv_load_dirty_bitmap(BlockDriverState *bs, const char *name, + Error **errp) +{ + BlockDriver *drv = bs->drv; + if (!drv) { + return NULL; + } + if (drv->bdrv_dirty_bitmap_load) { + return drv->bdrv_dirty_bitmap_load(bs, name, errp); + } + if (bs->file) { + return bdrv_load_dirty_bitmap(bs, name, errp); + } + return NULL; +} diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h index 37b5f23..66ba3f8 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -59,5 +59,7 @@ void bdrv_dirty_bitmap_set_internal_persistance(BdrvDirtyBitmap *bitmap, void bdrv_store_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, Error **errp); void bdrv_finalize_persistent_dirty_bitmaps(BlockDriverState *bs); +BdrvDirtyBitmap *bdrv_load_dirty_bitmap(BlockDriverState *bs, const char *name, + Error **errp); #endif -- 1.8.3.1