From nobody Mon Feb 9 16:19:16 2026 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.zoho.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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499120265653694.6654376771172; Mon, 3 Jul 2017 15:17:45 -0700 (PDT) Received: from localhost ([::1]:37484 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dS9f6-0000lr-5c for importer@patchew.org; Mon, 03 Jul 2017 18:17:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56026) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dS9d5-0007mo-48 for qemu-devel@nongnu.org; Mon, 03 Jul 2017 18:15:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dS9d3-0004lB-TP for qemu-devel@nongnu.org; Mon, 03 Jul 2017 18:15:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49706) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dS9cz-0004fa-6x; Mon, 03 Jul 2017 18:15:33 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3C085369C9; Mon, 3 Jul 2017 22:15:32 +0000 (UTC) Received: from red.redhat.com (ovpn-120-36.rdu2.redhat.com [10.10.120.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 879B51719B; Mon, 3 Jul 2017 22:15:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3C085369C9 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=eblake@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 3C085369C9 From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 3 Jul 2017 17:14:51 -0500 Message-Id: <20170703221456.30817-11-eblake@redhat.com> In-Reply-To: <20170703221456.30817-1-eblake@redhat.com> References: <20170703221456.30817-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 03 Jul 2017 22:15:32 +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] [PATCH v2 10/15] 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, Fam Zheng , qemu-block@nongnu.org, el13635@mail.ntua.gr, Max Reitz , Stefan Hajnoczi , jsnow@redhat.com 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 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 Reviewed-by: Fam Zheng --- v2: rebase to earlier changes --- block/io.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/block/io.c b/block/io.c index 2d324af..888f7a1 100644 --- a/block/io.c +++ b/block/io.c @@ -1676,17 +1676,17 @@ int bdrv_flush_all(void) } -typedef struct BdrvCoGetBlockStatusData { +typedef struct BdrvCoBlockStatusData { BlockDriverState *bs; BlockDriverState *base; BlockDriverState **file; - int64_t sector_num; - int nb_sectors; - int *pnum; + int64_t offset; + int64_t bytes; + int64_t *pnum; int64_t ret; bool allocation; bool done; -} BdrvCoGetBlockStatusData; +} BdrvCoBlockStatusData; int64_t coroutine_fn bdrv_co_get_block_status_from_file(BlockDriverState *= bs, int64_t sector_num, @@ -1913,14 +1913,16 @@ 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; data->ret =3D bdrv_co_get_block_status_above(data->bs, data->base, data->allocation, - data->sector_num, - data->nb_sectors, - data->pnum, + data->offset >> BDRV_SECTOR= _BITS, + data->bytes >> BDRV_SECTOR_= BITS, + &n, data->file); + *data->pnum =3D n * BDRV_SECTOR_SIZE; data->done =3D true; } @@ -1937,13 +1939,14 @@ static int64_t bdrv_common_block_status_above(Block= DriverState *bs, BlockDriverState **file) { Coroutine *co; - BdrvCoGetBlockStatusData data =3D { + int64_t n; + BdrvCoBlockStatusData data =3D { .bs =3D bs, .base =3D base, .file =3D file, - .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, .allocation =3D allocation, .done =3D false, }; @@ -1957,6 +1960,8 @@ static int64_t bdrv_common_block_status_above(BlockDr= iverState *bs, bdrv_coroutine_enter(bs, co); BDRV_POLL_WHILE(bs, !data.done); } + assert(data.ret < 0 || QEMU_IS_ALIGNED(n, BDRV_SECTOR_SIZE)); + *pnum =3D n >> BDRV_SECTOR_BITS; return data.ret; } --=20 2.9.4