From nobody Tue Feb 10 11:14:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15541206369341022.218387047; Mon, 1 Apr 2019 05:10:36 -0700 (PDT) Received: from localhost ([127.0.0.1]:55778 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAvlp-00020d-1L for importer@patchew.org; Mon, 01 Apr 2019 08:10:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAvhd-0007Os-PI for qemu-devel@nongnu.org; Mon, 01 Apr 2019 08:06:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hAvhc-0006j7-75 for qemu-devel@nongnu.org; Mon, 01 Apr 2019 08:06:13 -0400 Received: from relay.sw.ru ([185.231.240.75]:42930) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hAvhb-0006eV-TS; Mon, 01 Apr 2019 08:06:12 -0400 Received: from [172.16.25.136] (helo=localhost.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1hAvhW-0002g8-CC; Mon, 01 Apr 2019 15:06:06 +0300 From: Andrey Shinkevich To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 1 Apr 2019 15:06:03 +0300 Message-Id: <1554120365-39119-2-git-send-email-andrey.shinkevich@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1554120365-39119-1-git-send-email-andrey.shinkevich@virtuozzo.com> References: <1554120365-39119-1-git-send-email-andrey.shinkevich@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v2 1/3] block: include base when checking image chain for block allocation 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: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, berto@igalia.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, andrey.shinkevich@virtuozzo.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch is used in the 'block/stream: introduce a bottom node' that is following. Instead of the base node, the caller may pass the node that has the base as its backing image to the new function bdrv_is_allocated_above_inclusive() and get rid of the dependency on the base that may change during commit/stream parallel jobs. If the specified base is not found in the backing image chain, the function fails. Suggested-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Andrey Shinkevich Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/io.c | 32 +++++++++++++++++++++++++++----- include/block/block.h | 5 ++++- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/block/io.c b/block/io.c index dfc153b..7edeeb2 100644 --- a/block/io.c +++ b/block/io.c @@ -2317,7 +2317,8 @@ int coroutine_fn bdrv_is_allocated(BlockDriverState *= bs, int64_t offset, * Given an image chain: ... -> [BASE] -> [INTER1] -> [INTER2] -> [TOP] * * Return true if (a prefix of) the given range is allocated in any image - * between BASE and TOP (inclusive). BASE can be NULL to check if the giv= en + * between BASE and TOP (TOP included). To check the BASE image, set the + * 'base_included' to 'true'. The BASE can be NULL to check if the given * offset is allocated in any image of the chain. Return false otherwise, * or negative errno on failure. * @@ -2329,16 +2330,18 @@ int coroutine_fn bdrv_is_allocated(BlockDriverState= *bs, int64_t offset, * but 'pnum' will only be 0 when end of file is reached. * */ -int bdrv_is_allocated_above(BlockDriverState *top, - BlockDriverState *base, - int64_t offset, int64_t bytes, int64_t *pnum) +static int bdrv_do_is_allocated_above(BlockDriverState *top, + BlockDriverState *base, + bool base_included, int64_t offset, + int64_t bytes, int64_t *pnum) { BlockDriverState *intermediate; int ret; int64_t n =3D bytes; + assert(base || !base_included); =20 intermediate =3D top; - while (intermediate && intermediate !=3D base) { + while (base_included || intermediate !=3D base) { int64_t pnum_inter; int64_t size_inter; =20 @@ -2360,6 +2363,10 @@ int bdrv_is_allocated_above(BlockDriverState *top, n =3D pnum_inter; } =20 + if (intermediate =3D=3D base) { + break; + } + intermediate =3D backing_bs(intermediate); } =20 @@ -2367,6 +2374,21 @@ int bdrv_is_allocated_above(BlockDriverState *top, return 0; } =20 +int bdrv_is_allocated_above(BlockDriverState *top, + BlockDriverState *base, + int64_t offset, int64_t bytes, int64_t *pnum) +{ + return bdrv_do_is_allocated_above(top, base, false, offset, bytes, pnu= m); +} + +int bdrv_is_allocated_above_inclusive(BlockDriverState *top, + BlockDriverState *base, + int64_t offset, int64_t bytes, + int64_t *pnum) +{ + return bdrv_do_is_allocated_above(top, base, true, offset, bytes, pnum= ); +} + typedef struct BdrvVmstateCo { BlockDriverState *bs; QEMUIOVector *qiov; diff --git a/include/block/block.h b/include/block/block.h index c7a2619..a7846d9 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -448,7 +448,10 @@ int bdrv_is_allocated(BlockDriverState *bs, int64_t of= fset, int64_t bytes, int64_t *pnum); int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base, int64_t offset, int64_t bytes, int64_t *pnum); - +int bdrv_is_allocated_above_inclusive(BlockDriverState *top, + BlockDriverState *base, + int64_t offset, int64_t bytes, + int64_t *pnum); bool bdrv_is_read_only(BlockDriverState *bs); int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only, bool ignore_allow_rdw, Error **errp); --=20 1.8.3.1