From 0814a73e7a3c0ab6b710ddf303f9838bd00c6fc4 Mon Sep 17 00:00:00 2001 From: Jeffrey Cody Date: Wed, 21 Mar 2012 21:54:48 +0100 Subject: [PATCH 21/55] block: drop .bdrv_is_allocated() interface RH-Author: Jeffrey Cody Message-id: <83c0a5e70d834b820f0138a68867a77b1e00f6f1.1332362400.git.jcody@redhat.com> Patchwork-id: 38871 O-Subject: [RHEL6.3 qemu-kvm PATCH v8 21/54] block: drop .bdrv_is_allocated() interface Bugzilla: 582475 RH-Acked-by: Paolo Bonzini RH-Acked-by: Marcelo Tosatti RH-Acked-by: Kevin Wolf 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 (cherry picked from commit 6aebab140d1891813628f0148c6c4d66b5c1dd66) Signed-off-by: Stefan Hajnoczi Signed-off-by: Anthony Liguori Signed-off-by: Jeff Cody --- block.c | 38 ++++++++++++++++++-------------------- block_int.h | 2 -- 2 files changed, 18 insertions(+), 22 deletions(-) Signed-off-by: Michal Novotny --- block.c | 38 ++++++++++++++++++-------------------- block_int.h | 2 -- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/block.c b/block.c index 61e1882..6666aba 100644 --- a/block.c +++ b/block.c @@ -1790,25 +1790,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; @@ -1817,7 +1800,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; } static void bdrv_print_dict(QObject *obj, void *opaque) diff --git a/block_int.h b/block_int.h index 5c564ae..7655876 100644 --- a/block_int.h +++ b/block_int.h @@ -61,8 +61,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.7.6