From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPa4g-00030H-P8 for qemu-devel@nongnu.org; Tue, 19 Jul 2016 14:49:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPa4f-0005fO-1K for qemu-devel@nongnu.org; Tue, 19 Jul 2016 14:48:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52265) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPa4e-0005fK-RR for qemu-devel@nongnu.org; Tue, 19 Jul 2016 14:48:56 -0400 From: Stefan Hajnoczi Date: Tue, 19 Jul 2016 19:48:06 +0100 Message-Id: <1468954095-5159-17-git-send-email-stefanha@redhat.com> In-Reply-To: <1468954095-5159-1-git-send-email-stefanha@redhat.com> References: <1468954095-5159-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL for-2.7 16/25] blkreplay: Switch .bdrv_co_discard() to byte-based List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Eric Blake , Stefan Hajnoczi From: Eric Blake Another step towards killing off sector-based block APIs. Signed-off-by: Eric Blake Reviewed-by: Stefan Hajnoczi Message-id: 1468624988-423-11-git-send-email-eblake@redhat.com Signed-off-by: Stefan Hajnoczi --- block/blkreplay.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/block/blkreplay.c b/block/blkreplay.c index c69e5a5..30f9d5f 100755 --- a/block/blkreplay.c +++ b/block/blkreplay.c @@ -114,12 +114,11 @@ static int coroutine_fn blkreplay_co_pwrite_zeroes(BlockDriverState *bs, return ret; } -static int coroutine_fn blkreplay_co_discard(BlockDriverState *bs, - int64_t sector_num, int nb_sectors) +static int coroutine_fn blkreplay_co_pdiscard(BlockDriverState *bs, + int64_t offset, int count) { uint64_t reqid = request_id++; - int ret = bdrv_co_pdiscard(bs->file->bs, sector_num << BDRV_SECTOR_BITS, - nb_sectors << BDRV_SECTOR_BITS); + int ret = bdrv_co_pdiscard(bs->file->bs, offset, count); block_request_create(reqid, bs, qemu_coroutine_self()); qemu_coroutine_yield(); @@ -149,7 +148,7 @@ static BlockDriver bdrv_blkreplay = { .bdrv_co_pwritev = blkreplay_co_pwritev, .bdrv_co_pwrite_zeroes = blkreplay_co_pwrite_zeroes, - .bdrv_co_discard = blkreplay_co_discard, + .bdrv_co_pdiscard = blkreplay_co_pdiscard, .bdrv_co_flush = blkreplay_co_flush, }; -- 2.7.4