From patchwork Fri Nov 11 16:47:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 125225 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C1AC11007D8 for ; Sat, 12 Nov 2011 04:29:28 +1100 (EST) Received: from localhost ([::1]:37315 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROuHU-0002YY-C2 for incoming@patchwork.ozlabs.org; Fri, 11 Nov 2011 11:48:44 -0500 Received: from eggs.gnu.org ([140.186.70.92]:54241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROuGR-0007hW-Qd for qemu-devel@nongnu.org; Fri, 11 Nov 2011 11:47:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ROuGQ-0000qA-G6 for qemu-devel@nongnu.org; Fri, 11 Nov 2011 11:47:39 -0500 Received: from mtagate1.uk.ibm.com ([194.196.100.161]:37121) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROuGQ-0000pZ-7R for qemu-devel@nongnu.org; Fri, 11 Nov 2011 11:47:38 -0500 Received: from d06nrmr1806.portsmouth.uk.ibm.com (d06nrmr1806.portsmouth.uk.ibm.com [9.149.39.193]) by mtagate1.uk.ibm.com (8.13.1/8.13.1) with ESMTP id pABGlaaB023100 for ; Fri, 11 Nov 2011 16:47:36 GMT Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pABGlalW2658386 for ; Fri, 11 Nov 2011 16:47:36 GMT Received: from d06av08.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pABGlaCu031954 for ; Fri, 11 Nov 2011 16:47:36 GMT Received: from localhost (stefanha-thinkpad.manchester-maybrook.uk.ibm.com [9.174.219.31]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id pABGlalI031946; Fri, 11 Nov 2011 16:47:36 GMT From: Stefan Hajnoczi To: Date: Fri, 11 Nov 2011 16:47:21 +0000 Message-Id: <1321030042-20446-10-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1321030042-20446-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1321030042-20446-1-git-send-email-stefanha@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 194.196.100.161 Cc: Kevin Wolf , Paolo Bonzini , Marcelo Tosatti , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 09/10] block: drop .bdrv_is_allocated() interface X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- block.c | 38 ++++++++++++++++++-------------------- block_int.h | 2 -- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/block.c b/block.c index f8705b7..082734b 100644 --- a/block.c +++ b/block.c @@ -1805,25 +1805,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; @@ -1832,7 +1815,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 1c1351c..821237b 100644 --- a/block_int.h +++ b/block_int.h @@ -63,8 +63,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 */