From patchwork Tue Apr 18 01:33:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 9684845 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 16CC8602C2 for ; Tue, 18 Apr 2017 01:53:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0786426E96 for ; Tue, 18 Apr 2017 01:53:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F08B827CF9; Tue, 18 Apr 2017 01:53:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 946CC26E96 for ; Tue, 18 Apr 2017 01:53:25 +0000 (UTC) Received: from localhost ([::1]:39581 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0IKa-0003OI-Rg for patchwork-qemu-devel@patchwork.kernel.org; Mon, 17 Apr 2017 21:53:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34669) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0I36-00068v-PJ for qemu-devel@nongnu.org; Mon, 17 Apr 2017 21:35:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0I35-00048H-L5 for qemu-devel@nongnu.org; Mon, 17 Apr 2017 21:35:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59068) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0I2y-00046F-Mk; Mon, 17 Apr 2017 21:35:12 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A5FAB80F6B; Tue, 18 Apr 2017 01:35:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A5FAB80F6B Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=eblake@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A5FAB80F6B Received: from red.redhat.com (ovpn-121-102.rdu2.redhat.com [10.10.121.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB2317835E; Tue, 18 Apr 2017 01:35:08 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 17 Apr 2017 20:33:56 -0500 Message-Id: <20170418013356.3578-32-eblake@redhat.com> In-Reply-To: <20170418013356.3578-1-eblake@redhat.com> References: <20170418013356.3578-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 18 Apr 2017 01:35:11 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 31/31] block: Drop unused .bdrv_co_get_block_status() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Max Reitz , Stefan Hajnoczi , kwolf@nongnu.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP We are gradually moving away from sector-based interfaces, towards byte-based. Now that all drivers have been updated to provide the byte-based .bdrv_co_block_status(), we can delete the sector-based interface. Signed-off-by: Eric Blake --- include/block/block_int.h | 3 --- block/io.c | 59 ++++++++++++++++++++--------------------------- 2 files changed, 25 insertions(+), 37 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index 8f20bc3..25197d7 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -174,9 +174,6 @@ struct BlockDriver { * BDRV_BLOCK_DATA, _ZERO, _OFFSET_VALID, and _RAW, and only * according to the current BDS. */ - int64_t coroutine_fn (*bdrv_co_get_block_status)(BlockDriverState *bs, - int64_t sector_num, int nb_sectors, int *pnum, - BlockDriverState **file); int64_t coroutine_fn (*bdrv_co_block_status)(BlockDriverState *bd, int64_t offset, int64_t bytes, int64_t *pnum, BlockDriverState **file); diff --git a/block/io.c b/block/io.c index 361eeb8..0488d08 100644 --- a/block/io.c +++ b/block/io.c @@ -1719,6 +1719,7 @@ static int64_t coroutine_fn bdrv_co_block_status(BlockDriverState *bs, int64_t n; /* bytes */ int64_t ret, ret2; BlockDriverState *tmp_file; + int64_t aligned_offset, aligned_bytes; total_size = bdrv_getlength(bs); if (total_size < 0) { @@ -1738,7 +1739,7 @@ static int64_t coroutine_fn bdrv_co_block_status(BlockDriverState *bs, bytes = n; } - if (!bs->drv->bdrv_co_get_block_status && !bs->drv->bdrv_co_block_status) { + if (!bs->drv->bdrv_co_block_status) { *pnum = bytes; ret = BDRV_BLOCK_DATA | BDRV_BLOCK_ALLOCATED; if (bs->drv->protocol_name) { @@ -1752,45 +1753,35 @@ static int64_t coroutine_fn bdrv_co_block_status(BlockDriverState *bs, } *file = NULL; bdrv_inc_in_flight(bs); - if (bs->drv->bdrv_co_get_block_status) { - int count; /* sectors */ - assert(QEMU_IS_ALIGNED(offset | bytes, BDRV_SECTOR_SIZE)); - ret = bs->drv->bdrv_co_get_block_status(bs, offset >> BDRV_SECTOR_BITS, - bytes >> BDRV_SECTOR_BITS, - &count, file); - *pnum = count * BDRV_SECTOR_SIZE; - } else { - /* Round out to request_alignment boundaries */ - int64_t aligned_offset, aligned_bytes; - - aligned_offset = QEMU_ALIGN_DOWN(offset, bs->bl.request_alignment); - aligned_bytes = ROUND_UP(offset + bytes, - bs->bl.request_alignment) - aligned_offset; - ret = bs->drv->bdrv_co_block_status(bs, aligned_offset, aligned_bytes, - &n, file); - /* Clamp pnum and ret to original request */ - if (aligned_offset != offset && ret >= 0) { - int sectors = DIV_ROUND_UP(offset, BDRV_SECTOR_SIZE) - - DIV_ROUND_UP(aligned_offset, BDRV_SECTOR_SIZE); - - assert(n >= offset - aligned_offset); - n -= offset - aligned_offset; - if (sectors) { - ret += sectors * BDRV_SECTOR_SIZE; - } - } - if (ret >= 0 && n > bytes) { - assert(aligned_bytes != bytes); - n = bytes; - } - *pnum = n; - } + /* Round out to request_alignment boundaries */ + aligned_offset = QEMU_ALIGN_DOWN(offset, bs->bl.request_alignment); + aligned_bytes = ROUND_UP(offset + bytes, + bs->bl.request_alignment) - aligned_offset; + ret = bs->drv->bdrv_co_block_status(bs, aligned_offset, aligned_bytes, + &n, file); if (ret < 0) { *pnum = 0; goto out; } + /* Clamp pnum and ret to original request */ + if (aligned_offset != offset && ret >= 0) { + int sectors = DIV_ROUND_UP(offset, BDRV_SECTOR_SIZE) - + DIV_ROUND_UP(aligned_offset, BDRV_SECTOR_SIZE); + + assert(n >= offset - aligned_offset); + n -= offset - aligned_offset; + if (sectors) { + ret += sectors * BDRV_SECTOR_SIZE; + } + } + if (n > bytes) { + assert(aligned_bytes != bytes); + n = bytes; + } + *pnum = n; + if (ret & BDRV_BLOCK_RAW) { assert(ret & BDRV_BLOCK_OFFSET_VALID); ret = bdrv_block_status(*file, ret & BDRV_BLOCK_OFFSET_MASK,