From nobody Sun Oct 5 19:22:54 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518723236666579.5651142884465; Thu, 15 Feb 2018 11:33:56 -0800 (PST) Received: from localhost ([::1]:52283 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emPI3-0001s2-R8 for importer@patchew.org; Thu, 15 Feb 2018 14:33:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emPD9-0006Ff-GB for qemu-devel@nongnu.org; Thu, 15 Feb 2018 14:28:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emPD8-0000mE-DI for qemu-devel@nongnu.org; Thu, 15 Feb 2018 14:28:51 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49476 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1emPD5-0000kp-Q5; Thu, 15 Feb 2018 14:28:47 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 65163404085A; Thu, 15 Feb 2018 19:28:47 +0000 (UTC) Received: from red.redhat.com (ovpn-122-122.rdu2.redhat.com [10.10.122.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF156F41A0; Thu, 15 Feb 2018 19:28:46 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 13:28:29 -0600 Message-Id: <20180215192829.9944-7-eblake@redhat.com> In-Reply-To: <20180215192829.9944-1-eblake@redhat.com> References: <20180215192829.9944-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 15 Feb 2018 19:28:47 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 15 Feb 2018 19:28:47 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'eblake@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 6/6] block: Drop last of the sector-based aio callbacks 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: kwolf@redhat.com, Fam Zheng , Stefan Hajnoczi , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We are gradually moving away from sector-based interfaces, towards byte-based. Now that all drivers with aio callbacks are using the byte-based interfaces, we can remove the sector-based versions. Signed-off-by: Eric Blake --- include/block/block_int.h | 6 ------ block/io.c | 23 ++++++----------------- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index c882dc4232d..0f5b7accfa8 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -134,15 +134,9 @@ struct BlockDriver { void (*bdrv_refresh_filename)(BlockDriverState *bs, QDict *options); /* aio */ - BlockAIOCB *(*bdrv_aio_readv)(BlockDriverState *bs, - int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockCompletionFunc *cb, void *opaque); BlockAIOCB *(*bdrv_aio_preadv)(BlockDriverState *bs, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags, BlockCompletionFunc *cb, void *opaque); - BlockAIOCB *(*bdrv_aio_writev)(BlockDriverState *bs, - int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockCompletionFunc *cb, void *opaque); BlockAIOCB *(*bdrv_aio_pwritev)(BlockDriverState *bs, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags, BlockCompletionFunc *cb, void *opaque); diff --git a/block/io.c b/block/io.c index 84a4caa72b7..04239f01eef 100644 --- a/block/io.c +++ b/block/io.c @@ -948,13 +948,8 @@ static int coroutine_fn bdrv_driver_preadv(BlockDriver= State *bs, .coroutine =3D qemu_coroutine_self(), }; - if (drv->bdrv_aio_preadv) { - acb =3D bs->drv->bdrv_aio_preadv(bs, offset, bytes, qiov, flag= s, - bdrv_co_io_em_complete, &co); - } else { - acb =3D bs->drv->bdrv_aio_readv(bs, sector_num, qiov, nb_secto= rs, - bdrv_co_io_em_complete, &co); - } + acb =3D bs->drv->bdrv_aio_preadv(bs, offset, bytes, qiov, flags, + bdrv_co_io_em_complete, &co); if (acb =3D=3D NULL) { return -EIO; } else { @@ -1008,16 +1003,10 @@ static int coroutine_fn bdrv_driver_pwritev(BlockDr= iverState *bs, .coroutine =3D qemu_coroutine_self(), }; - if (drv->bdrv_aio_pwritev) { - acb =3D bs->drv->bdrv_aio_pwritev(bs, offset, bytes, qiov, - flags & bs->supported_write_fl= ags, - bdrv_co_io_em_complete, &co); - flags &=3D ~bs->supported_write_flags; - } else { - assert(!bs->supported_write_flags); - acb =3D bs->drv->bdrv_aio_writev(bs, sector_num, qiov, nb_sect= ors, - bdrv_co_io_em_complete, &co); - } + acb =3D bs->drv->bdrv_aio_pwritev(bs, offset, bytes, qiov, + flags & bs->supported_write_flags, + bdrv_co_io_em_complete, &co); + flags &=3D ~bs->supported_write_flags; if (acb =3D=3D NULL) { ret =3D -EIO; } else { --=20 2.14.3