From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36697) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZg5n-0007nb-BX for qemu-devel@nongnu.org; Fri, 03 Feb 2017 10:48:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cZg5j-00081U-1l for qemu-devel@nongnu.org; Fri, 03 Feb 2017 10:48:07 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:43037 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 1cZg5i-0007zK-Mk for qemu-devel@nongnu.org; Fri, 03 Feb 2017 10:48:02 -0500 From: Vladimir Sementsov-Ogievskiy Date: Fri, 3 Feb 2017 18:47:49 +0300 Message-Id: <20170203154757.36140-11-vsementsov@virtuozzo.com> In-Reply-To: <20170203154757.36140-1-vsementsov@virtuozzo.com> References: <20170203154757.36140-1-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 10/18] block/dirty-bitmap: add bdrv_load_dirty_bitmap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org, qemu-devel@nongnu.org Cc: famz@redhat.com, jsnow@redhat.com, kwolf@redhat.com, mreitz@redhat.com, pbonzini@redhat.com, armbru@redhat.com, eblake@redhat.com, den@virtuozzo.com, stefanha@redhat.com Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/dirty-bitmap.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ include/block/block_int.h | 4 ++++ include/block/dirty-bitmap.h | 3 +++ 3 files changed, 60 insertions(+) diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 3b7db1d78c..394d4328d5 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -545,3 +545,56 @@ BdrvDirtyBitmap *bdrv_dirty_bitmap_next(BlockDriverState *bs, return bitmap == NULL ? QLIST_FIRST(&bs->dirty_bitmaps) : QLIST_NEXT(bitmap, list); } + +typedef struct BDRVLoadBitmapCo { + BlockDriverState *bs; + const char *name; + Error **errp; + BdrvDirtyBitmap *ret; + bool in_progress; +} BDRVLoadBitmapCo; + +static void bdrv_load_dity_bitmap_co_entry(void *opaque) +{ + BDRVLoadBitmapCo *lbco = opaque; + BlockDriver *drv = lbco->bs->drv; + + if (!!drv && !!drv->bdrv_dirty_bitmap_load) { + lbco->ret = drv->bdrv_dirty_bitmap_load(lbco->bs, lbco->name, + lbco->errp); + } else if (lbco->bs->file) { + BlockDriverState *bs = lbco->bs; + lbco->bs = lbco->bs->file->bs; + bdrv_load_dity_bitmap_co_entry(lbco); + if (lbco->ret != NULL) { + QLIST_REMOVE(lbco->ret, list); + QLIST_INSERT_HEAD(&bs->dirty_bitmaps, lbco->ret, list); + } + } else { + lbco->ret = NULL; + } + + lbco->in_progress = false; +} + +BdrvDirtyBitmap *bdrv_load_dirty_bitmap(BlockDriverState *bs, const char *name, + Error **errp) +{ + Coroutine *co; + BDRVLoadBitmapCo lbco = { + .bs = bs, + .name = name, + .errp = errp, + .in_progress = true + }; + + if (qemu_in_coroutine()) { + bdrv_load_dity_bitmap_co_entry(&lbco); + } else { + co = qemu_coroutine_create(bdrv_load_dity_bitmap_co_entry, &lbco); + qemu_coroutine_enter(co); + BDRV_POLL_WHILE(bs, lbco.in_progress); + } + + return lbco.ret; +} diff --git a/include/block/block_int.h b/include/block/block_int.h index 83a423c580..d3770db539 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -222,6 +222,10 @@ struct BlockDriver { int (*bdrv_get_info)(BlockDriverState *bs, BlockDriverInfo *bdi); ImageInfoSpecific *(*bdrv_get_specific_info)(BlockDriverState *bs); + BdrvDirtyBitmap *(*bdrv_dirty_bitmap_load)(BlockDriverState *bs, + const char *name, + Error **errp); + int coroutine_fn (*bdrv_save_vmstate)(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos); diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h index ff8163ba02..c0c70a8c67 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -77,4 +77,7 @@ int64_t bdrv_dirty_bitmap_next_zero(BdrvDirtyBitmap *bitmap, uint64_t start); BdrvDirtyBitmap *bdrv_dirty_bitmap_next(BlockDriverState *bs, BdrvDirtyBitmap *bitmap); +BdrvDirtyBitmap *bdrv_load_dirty_bitmap(BlockDriverState *bs, const char *name, + Error **errp); + #endif -- 2.11.0