From nobody Tue Apr 15 09:54:06 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1509024880559271.83560946796956; Thu, 26 Oct 2017 06:34:40 -0700 (PDT) Received: from localhost ([::1]:52941 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7iIs-0005IW-L3 for importer@patchew.org; Thu, 26 Oct 2017 09:34:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58740) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7i3E-0000Uq-BV for qemu-devel@nongnu.org; Thu, 26 Oct 2017 09:18:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7i34-0001re-Pr for qemu-devel@nongnu.org; Thu, 26 Oct 2017 09:18:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58272) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e7i32-0001pC-A3; Thu, 26 Oct 2017 09:18:12 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6C7837E384; Thu, 26 Oct 2017 13:18:11 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.118.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id B211B7FB90; Thu, 26 Oct 2017 13:18:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6C7837E384 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kwolf@redhat.com From: Kevin Wolf To: qemu-block@nongnu.org Date: Thu, 26 Oct 2017 15:17:17 +0200 Message-Id: <20171026131741.5059-12-kwolf@redhat.com> In-Reply-To: <20171026131741.5059-1-kwolf@redhat.com> References: <20171026131741.5059-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 26 Oct 2017 13:18: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] [PULL 11/35] block: Switch BdrvCoGetBlockStatusData to byte-based 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 converting to byte-based interfaces, as they are easier to reason about than sector-based. Convert another internal type (no semantic change), and rename it to match the corresponding public function rename. Signed-off-by: Eric Blake Signed-off-by: Kevin Wolf --- block/io.c | 56 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/block/io.c b/block/io.c index 1c4dc4b1a1..71d5f18d04 100644 --- a/block/io.c +++ b/block/io.c @@ -1765,17 +1765,18 @@ int bdrv_flush_all(void) } =20 =20 -typedef struct BdrvCoGetBlockStatusData { +typedef struct BdrvCoBlockStatusData { BlockDriverState *bs; BlockDriverState *base; bool want_zero; - int64_t sector_num; - int nb_sectors; - int *pnum; + int64_t offset; + int64_t bytes; + int64_t *pnum; + int64_t *map; BlockDriverState **file; - int64_t ret; + int ret; bool done; -} BdrvCoGetBlockStatusData; +} BdrvCoBlockStatusData; =20 int64_t coroutine_fn bdrv_co_get_block_status_from_file(BlockDriverState *= bs, int64_t sector_num, @@ -2025,14 +2026,24 @@ static int64_t coroutine_fn bdrv_co_get_block_statu= s_above(BlockDriverState *bs, /* Coroutine wrapper for bdrv_get_block_status_above() */ static void coroutine_fn bdrv_get_block_status_above_co_entry(void *opaque) { - BdrvCoGetBlockStatusData *data =3D opaque; + BdrvCoBlockStatusData *data =3D opaque; + int n =3D 0; + int64_t ret; =20 - data->ret =3D bdrv_co_get_block_status_above(data->bs, data->base, - data->want_zero, - data->sector_num, - data->nb_sectors, - data->pnum, - data->file); + ret =3D bdrv_co_get_block_status_above(data->bs, data->base, + data->want_zero, + data->offset >> BDRV_SECTOR_BITS, + data->bytes >> BDRV_SECTOR_BITS, + &n, + data->file); + if (ret < 0) { + assert(INT_MIN <=3D ret); + data->ret =3D ret; + } else { + *data->pnum =3D n * BDRV_SECTOR_SIZE; + *data->map =3D ret & BDRV_BLOCK_OFFSET_MASK; + data->ret =3D ret & ~BDRV_BLOCK_OFFSET_MASK; + } data->done =3D true; } =20 @@ -2049,13 +2060,16 @@ static int64_t bdrv_common_block_status_above(Block= DriverState *bs, BlockDriverState **file) { Coroutine *co; - BdrvCoGetBlockStatusData data =3D { + int64_t n; + int64_t map; + BdrvCoBlockStatusData data =3D { .bs =3D bs, .base =3D base, .want_zero =3D want_zero, - .sector_num =3D sector_num, - .nb_sectors =3D nb_sectors, - .pnum =3D pnum, + .offset =3D sector_num * BDRV_SECTOR_SIZE, + .bytes =3D nb_sectors * BDRV_SECTOR_SIZE, + .pnum =3D &n, + .map =3D &map, .file =3D file, .done =3D false, }; @@ -2069,7 +2083,13 @@ static int64_t bdrv_common_block_status_above(BlockD= riverState *bs, bdrv_coroutine_enter(bs, co); BDRV_POLL_WHILE(bs, !data.done); } - return data.ret; + if (data.ret < 0) { + *pnum =3D 0; + return data.ret; + } + assert(QEMU_IS_ALIGNED(n | map, BDRV_SECTOR_SIZE)); + *pnum =3D n >> BDRV_SECTOR_BITS; + return data.ret | map; } =20 int64_t bdrv_get_block_status_above(BlockDriverState *bs, --=20 2.13.6