From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:46468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXZNU-0000iN-78 for qemu-devel@nongnu.org; Mon, 05 Dec 2011 09:18:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RXZNR-0000JI-Pp for qemu-devel@nongnu.org; Mon, 05 Dec 2011 09:18:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:4278) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXZNR-0000J6-GL for qemu-devel@nongnu.org; Mon, 05 Dec 2011 09:18:41 -0500 From: Kevin Wolf Date: Mon, 5 Dec 2011 15:21:04 +0100 Message-Id: <1323094878-7967-28-git-send-email-kwolf@redhat.com> In-Reply-To: <1323094878-7967-1-git-send-email-kwolf@redhat.com> References: <1323094878-7967-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 27/41] block: drop .bdrv_is_allocated() interface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Stefan Hajnoczi Now that all block drivers have been converted to .bdrv_co_is_allocated() we can drop .bdrv_is_allocated(). Note that the public bdrv_is_allocated() interface is still available but is in fact a synchronous wrapper around .bdrv_co_is_allocated(). Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- block.c | 38 ++++++++++++++++++-------------------- block_int.h | 2 -- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/block.c b/block.c index 611c429..50b058d 100644 --- a/block.c +++ b/block.c @@ -1921,25 +1921,8 @@ static void coroutine_fn bdrv_is_allocated_co_entry(void *opaque) int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnum) { - int64_t n; - if (bs->drv->bdrv_co_is_allocated) { - Coroutine *co; - BdrvCoIsAllocatedData data = { - .bs = bs, - .sector_num = sector_num, - .nb_sectors = nb_sectors, - .pnum = pnum, - .done = false, - }; - - co = qemu_coroutine_create(bdrv_is_allocated_co_entry); - qemu_coroutine_enter(co, &data); - while (!data.done) { - qemu_aio_wait(); - } - return data.ret; - } - if (!bs->drv->bdrv_is_allocated) { + if (!bs->drv->bdrv_co_is_allocated) { + int64_t n; if (sector_num >= bs->total_sectors) { *pnum = 0; return 0; @@ -1948,7 +1931,22 @@ int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors, *pnum = (n < nb_sectors) ? (n) : (nb_sectors); return 1; } - return bs->drv->bdrv_is_allocated(bs, sector_num, nb_sectors, pnum); + + Coroutine *co; + BdrvCoIsAllocatedData data = { + .bs = bs, + .sector_num = sector_num, + .nb_sectors = nb_sectors, + .pnum = pnum, + .done = false, + }; + + co = qemu_coroutine_create(bdrv_is_allocated_co_entry); + qemu_coroutine_enter(co, &data); + while (!data.done) { + qemu_aio_wait(); + } + return data.ret; } void bdrv_mon_event(const BlockDriverState *bdrv, diff --git a/block_int.h b/block_int.h index d5b5457..a0b46d7 100644 --- a/block_int.h +++ b/block_int.h @@ -80,8 +80,6 @@ struct BlockDriver { const uint8_t *buf, int nb_sectors); void (*bdrv_close)(BlockDriverState *bs); int (*bdrv_create)(const char *filename, QEMUOptionParameter *options); - int (*bdrv_is_allocated)(BlockDriverState *bs, int64_t sector_num, - int nb_sectors, int *pnum); int (*bdrv_set_key)(BlockDriverState *bs, const char *key); int (*bdrv_make_empty)(BlockDriverState *bs); /* aio */ -- 1.7.6.4