From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZaM2-00044D-Bt for qemu-devel@nongnu.org; Fri, 03 Feb 2017 04:40:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cZaLx-0004PS-Ja for qemu-devel@nongnu.org; Fri, 03 Feb 2017 04:40:30 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:32223 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cZaLx-0004N8-8Y for qemu-devel@nongnu.org; Fri, 03 Feb 2017 04:40:25 -0500 From: Vladimir Sementsov-Ogievskiy Date: Fri, 3 Feb 2017 12:40:02 +0300 Message-Id: <20170203094018.15493-9-vsementsov@virtuozzo.com> In-Reply-To: <20170203094018.15493-1-vsementsov@virtuozzo.com> References: <20170203094018.15493-1-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 08/24] block: introduce auto-loading bitmaps List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org, qemu-devel@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, armbru@redhat.com, eblake@redhat.com, jsnow@redhat.com, famz@redhat.com, den@openvz.org, stefanha@redhat.com, vsementsov@virtuozzo.com, pbonzini@redhat.com Auto loading bitmaps are bitmaps stored in the disk image, which should be loaded when the image is opened and become BdrvDirtyBitmaps for the corresponding drive. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: John Snow Reviewed-by: Max Reitz --- block.c | 14 ++++++++++++++ include/block/block.h | 2 ++ include/block/block_int.h | 3 +++ 3 files changed, 19 insertions(+) diff --git a/block.c b/block.c index a0346c80c6..56f030c562 100644 --- a/block.c +++ b/block.c @@ -1141,6 +1141,13 @@ static int bdrv_open_common(BlockDriverState *bs, BdrvChild *file, assert(bdrv_min_mem_align(bs) != 0); assert(is_power_of_2(bs->bl.request_alignment)); + bdrv_load_autoloading_dirty_bitmaps(bs, &local_err); + if (local_err) { + error_propagate(errp, local_err); + ret = -EINVAL; + goto free_and_fail; + } + qemu_opts_del(opts); return 0; @@ -4093,3 +4100,10 @@ void bdrv_del_child(BlockDriverState *parent_bs, BdrvChild *child, Error **errp) parent_bs->drv->bdrv_del_child(parent_bs, child, errp); } + +void bdrv_load_autoloading_dirty_bitmaps(BlockDriverState *bs, Error **errp) +{ + if (bs->drv && bs->drv->bdrv_load_autoloading_dirty_bitmaps) { + bs->drv->bdrv_load_autoloading_dirty_bitmaps(bs, errp); + } +} diff --git a/include/block/block.h b/include/block/block.h index 4e81f2069b..154ac7f955 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -551,4 +551,6 @@ void bdrv_add_child(BlockDriverState *parent, BlockDriverState *child, Error **errp); void bdrv_del_child(BlockDriverState *parent, BdrvChild *child, Error **errp); +void bdrv_load_autoloading_dirty_bitmaps(BlockDriverState *bs, Error **errp); + #endif diff --git a/include/block/block_int.h b/include/block/block_int.h index 2d92d7edfe..6b2b50c6a2 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -320,6 +320,9 @@ struct BlockDriver { void (*bdrv_del_child)(BlockDriverState *parent, BdrvChild *child, Error **errp); + void (*bdrv_load_autoloading_dirty_bitmaps)(BlockDriverState *bs, + Error **errp); + QLIST_ENTRY(BlockDriver) list; }; -- 2.11.0