From nobody Thu Dec 18 13:30:02 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 1526399500981347.4743570308739; Tue, 15 May 2018 08:51:40 -0700 (PDT) Received: from localhost ([::1]:44483 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIcEm-0006tU-4t for importer@patchew.org; Tue, 15 May 2018 11:51:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIc4N-0006bm-Q6 for qemu-devel@nongnu.org; Tue, 15 May 2018 11:40:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIc4H-0001JM-Ly for qemu-devel@nongnu.org; Tue, 15 May 2018 11:40:55 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:39510 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 1fIc4E-0001GQ-NB; Tue, 15 May 2018 11:40:46 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4C4454201AE0; Tue, 15 May 2018 15:40:46 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-164.ams2.redhat.com [10.36.117.164]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E6A52024CBA; Tue, 15 May 2018 15:40:45 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 15 May 2018 17:40:03 +0200 Message-Id: <20180515154033.19899-8-kwolf@redhat.com> In-Reply-To: <20180515154033.19899-1-kwolf@redhat.com> References: <20180515154033.19899-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Tue, 15 May 2018 15:40:46 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Tue, 15 May 2018 15:40:46 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@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] [PULL 07/37] 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, qemu-devel@nongnu.org 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" From: Eric Blake 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 Signed-off-by: Kevin Wolf --- include/block/block_int.h | 6 ---- block/io.c | 84 ++++++++++++++++++++-----------------------= ---- 2 files changed, 36 insertions(+), 54 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index e772e3502b..0bba7ed024 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -141,15 +141,9 @@ struct BlockDriver { void (*bdrv_refresh_filename)(BlockDriverState *bs, QDict *options); =20 /* 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 407bc25df4..6b110b207a 100644 --- a/block/io.c +++ b/block/io.c @@ -925,31 +925,14 @@ static int coroutine_fn bdrv_driver_preadv(BlockDrive= rState *bs, return drv->bdrv_co_preadv(bs, offset, bytes, qiov, flags); } =20 - /* FIXME - no need to calculate these if .bdrv_aio_preadv exists */ - sector_num =3D offset >> BDRV_SECTOR_BITS; - nb_sectors =3D bytes >> BDRV_SECTOR_BITS; - - if (!drv->bdrv_aio_preadv) { - assert((offset & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); - assert((bytes & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); - assert((bytes >> BDRV_SECTOR_BITS) <=3D BDRV_REQUEST_MAX_SECTORS); - } - - if (drv->bdrv_co_readv) { - return drv->bdrv_co_readv(bs, sector_num, nb_sectors, qiov); - } else { + if (drv->bdrv_aio_preadv) { BlockAIOCB *acb; CoroutineIOCompletion co =3D { .coroutine =3D qemu_coroutine_self(), }; =20 - if (drv->bdrv_aio_preadv) { - acb =3D drv->bdrv_aio_preadv(bs, offset, bytes, qiov, flags, - bdrv_co_io_em_complete, &co); - } else { - acb =3D drv->bdrv_aio_readv(bs, sector_num, qiov, nb_sectors, - bdrv_co_io_em_complete, &co); - } + acb =3D drv->bdrv_aio_preadv(bs, offset, bytes, qiov, flags, + bdrv_co_io_em_complete, &co); if (acb =3D=3D NULL) { return -EIO; } else { @@ -957,6 +940,16 @@ static int coroutine_fn bdrv_driver_preadv(BlockDriver= State *bs, return co.ret; } } + + sector_num =3D offset >> BDRV_SECTOR_BITS; + nb_sectors =3D bytes >> BDRV_SECTOR_BITS; + + assert((offset & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); + assert((bytes & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); + assert((bytes >> BDRV_SECTOR_BITS) <=3D BDRV_REQUEST_MAX_SECTORS); + assert(drv->bdrv_co_readv); + + return drv->bdrv_co_readv(bs, sector_num, nb_sectors, qiov); } =20 static int coroutine_fn bdrv_driver_pwritev(BlockDriverState *bs, @@ -981,45 +974,40 @@ static int coroutine_fn bdrv_driver_pwritev(BlockDriv= erState *bs, goto emulate_flags; } =20 - /* FIXME - no need to calculate these if .bdrv_aio_pwritev exists */ - sector_num =3D offset >> BDRV_SECTOR_BITS; - nb_sectors =3D bytes >> BDRV_SECTOR_BITS; - - if (!drv->bdrv_aio_pwritev) { - assert((offset & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); - assert((bytes & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); - assert((bytes >> BDRV_SECTOR_BITS) <=3D BDRV_REQUEST_MAX_SECTORS); - } - - if (drv->bdrv_co_writev_flags) { - ret =3D drv->bdrv_co_writev_flags(bs, sector_num, nb_sectors, qiov, - flags & bs->supported_write_flags); - flags &=3D ~bs->supported_write_flags; - } else if (drv->bdrv_co_writev) { - assert(!bs->supported_write_flags); - ret =3D drv->bdrv_co_writev(bs, sector_num, nb_sectors, qiov); - } else { + if (drv->bdrv_aio_pwritev) { BlockAIOCB *acb; CoroutineIOCompletion co =3D { .coroutine =3D qemu_coroutine_self(), }; =20 - if (drv->bdrv_aio_pwritev) { - acb =3D 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; - } else { - assert(!bs->supported_write_flags); - acb =3D drv->bdrv_aio_writev(bs, sector_num, qiov, nb_sectors, - bdrv_co_io_em_complete, &co); - } + acb =3D 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 { qemu_coroutine_yield(); ret =3D co.ret; } + goto emulate_flags; + } + + sector_num =3D offset >> BDRV_SECTOR_BITS; + nb_sectors =3D bytes >> BDRV_SECTOR_BITS; + + assert((offset & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); + assert((bytes & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); + assert((bytes >> BDRV_SECTOR_BITS) <=3D BDRV_REQUEST_MAX_SECTORS); + + if (drv->bdrv_co_writev_flags) { + ret =3D drv->bdrv_co_writev_flags(bs, sector_num, nb_sectors, qiov, + flags & bs->supported_write_flags); + flags &=3D ~bs->supported_write_flags; + } else { + assert(drv->bdrv_co_writev); + assert(!bs->supported_write_flags); + ret =3D drv->bdrv_co_writev(bs, sector_num, nb_sectors, qiov); } =20 emulate_flags: --=20 2.13.6