From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bOCSE-0003xo-FN for qemu-devel@nongnu.org; Fri, 15 Jul 2016 19:23:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bOCSD-0004NZ-Ed for qemu-devel@nongnu.org; Fri, 15 Jul 2016 19:23:34 -0400 From: Eric Blake Date: Fri, 15 Jul 2016 17:23:06 -0600 Message-Id: <1468624988-423-18-git-send-email-eblake@redhat.com> In-Reply-To: <1468624988-423-1-git-send-email-eblake@redhat.com> References: <1468624988-423-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v2 17/19] block: Kill .bdrv_co_discard() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, pbonzini@redhat.com, kwolf@redhat.com, stefanha@redhat.com, Fam Zheng , Max Reitz Now that all drivers have a byte-based .bdrv_co_pdiscard(), we no longer need to worry about the sector-based version. We can also relax our minimum alignment to 1 for drivers that support it. Signed-off-by: Eric Blake Reviewed-by: Stefan Hajnoczi --- include/block/block_int.h | 2 -- block/io.c | 9 ++------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index b4d4cd2..42bbed4 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -165,8 +165,6 @@ struct BlockDriver { */ int coroutine_fn (*bdrv_co_pwrite_zeroes)(BlockDriverState *bs, int64_t offset, int count, BdrvRequestFlags flags); - int coroutine_fn (*bdrv_co_discard)(BlockDriverState *bs, - int64_t sector_num, int nb_sectors); int coroutine_fn (*bdrv_co_pdiscard)(BlockDriverState *bs, int64_t offset, int count); int64_t coroutine_fn (*bdrv_co_get_block_status)(BlockDriverState *bs, diff --git a/block/io.c b/block/io.c index ee87fbf..b81d1fc 100644 --- a/block/io.c +++ b/block/io.c @@ -2403,14 +2403,12 @@ int coroutine_fn bdrv_co_pdiscard(BlockDriverState *bs, int64_t offset, return 0; } - if (!bs->drv->bdrv_co_discard && !bs->drv->bdrv_co_pdiscard && - !bs->drv->bdrv_aio_pdiscard) { + if (!bs->drv->bdrv_co_pdiscard && !bs->drv->bdrv_aio_pdiscard) { return 0; } /* Discard is advisory, so ignore any unaligned head or tail */ - align = MAX(BDRV_SECTOR_SIZE, - MAX(bs->bl.pdiscard_alignment, bs->bl.request_alignment)); + align = MAX(bs->bl.pdiscard_alignment, bs->bl.request_alignment); assert(is_power_of_2(align)); head = MIN(count, -offset & (align - 1)); if (head) { @@ -2438,9 +2436,6 @@ int coroutine_fn bdrv_co_pdiscard(BlockDriverState *bs, int64_t offset, if (bs->drv->bdrv_co_pdiscard) { ret = bs->drv->bdrv_co_pdiscard(bs, offset, num); - } else if (bs->drv->bdrv_co_discard) { - ret = bs->drv->bdrv_co_discard(bs, offset >> BDRV_SECTOR_BITS, - num >> BDRV_SECTOR_BITS); } else { BlockAIOCB *acb; CoroutineIOCompletion co = { -- 2.5.5