From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ceLJS-0002Sw-AF for qemu-devel@nongnu.org; Thu, 16 Feb 2017 07:37:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ceLJN-0002sF-DM for qemu-devel@nongnu.org; Thu, 16 Feb 2017 07:37:30 -0500 References: <20170203154757.36140-1-vsementsov@virtuozzo.com> <20170203154757.36140-11-vsementsov@virtuozzo.com> From: "Denis V. Lunev" Message-ID: <7c75e808-f356-b369-0cb7-620fcf4605f0@virtuozzo.com> Date: Thu, 16 Feb 2017 15:37:16 +0300 MIME-Version: 1.0 In-Reply-To: <20170203154757.36140-11-vsementsov@virtuozzo.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: Re: [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: Vladimir Sementsov-Ogievskiy , 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, stefanha@redhat.com On 02/03/2017 06:47 PM, Vladimir Sementsov-Ogievskiy wrote: > 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) > +{ I think that you'd better check bs->drv here and not call coroutine in this case at all. > + 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