From nobody Mon May 12 13:11:34 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1695282983; cv=none; d=zohomail.com; s=zohoarc; b=Kb1IdqpSpOwNcfosJH7AC08BmfRPTlnvU4VQi2Fw8XnYe0R9diezAuJ48Ub71xhny3lVUy/iM9tXDj7oK9D+N1ugWkYLH1/b0gDKOaIu3fDASNDsxh+HPS91Bw986nVs97++wLnAg1kiPBE55mtPpYmatwm0cF759QelaDbDxAo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695282983; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=cWDno6opGjZC87ZyGmyZWBAwQbX/845ncGgWsF/Vug4=; b=cUNraBtBZJWQWCcHl55RtiODrIztPcmENHi9bs5DHnyLGqFC6vbHliKIwicFul6865AOVEupW3JN66wUZ4KliA2s2QNjS8OLqajrBF0w1bL4Bkt7rkvKSblb/qtDeyVvapXSQcjr4tdnf3/NVgA03vUsG179Zou6MfOirAbFbFk= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695282983687581.7186312142942; Thu, 21 Sep 2023 00:56:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjEWk-0004mm-5j; Thu, 21 Sep 2023 03:55:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjEWh-0004jZ-Lv; Thu, 21 Sep 2023 03:55:07 -0400 Received: from relay.virtuozzo.com ([130.117.225.111]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qjEWf-0001Uh-QV; Thu, 21 Sep 2023 03:55:07 -0400 Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=iris.sw.ru) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1qjEWQ-00BsUn-2j; Thu, 21 Sep 2023 09:55:03 +0200 To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, "Denis V. Lunev" , Alexander Ivanov Subject: [PULL v2 07/22] parallels: refactor path when we need to re-check image in parallels_open Date: Thu, 21 Sep 2023 09:54:45 +0200 Message-Id: <20230921075500.694585-8-den@openvz.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921075500.694585-1-den@openvz.org> References: <20230921075500.694585-1-den@openvz.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=130.117.225.111; envelope-from=den@openvz.org; helo=relay.virtuozzo.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: "Denis V. Lunev" From: "Denis V. Lunev" via Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZM-MESSAGEID: 1695282984932100007 Content-Type: text/plain; charset="utf-8" More conditions follows thus the check should be more scalable. Signed-off-by: Denis V. Lunev Reviewed-by: Alexander Ivanov --- block/parallels.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/block/parallels.c b/block/parallels.c index bd26c8db63..af3b4894d7 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -1071,7 +1071,7 @@ static int parallels_open(BlockDriverState *bs, QDict= *options, int flags, int ret, size, i; int64_t file_nb_sectors, sector; uint32_t data_start; - bool data_off_is_correct; + bool need_check =3D false; =20 ret =3D parallels_opts_prealloc(bs, options, errp); if (ret < 0) { @@ -1139,11 +1139,14 @@ static int parallels_open(BlockDriverState *bs, QDi= ct *options, int flags, s->bat_bitmap =3D (uint32_t *)(s->header + 1); =20 if (le32_to_cpu(ph.inuse) =3D=3D HEADER_INUSE_MAGIC) { - s->header_unclean =3D true; + need_check =3D s->header_unclean =3D true; + } + + { + bool ok =3D parallels_test_data_off(s, file_nb_sectors, &data_star= t); + need_check =3D need_check || !ok; } =20 - data_off_is_correct =3D parallels_test_data_off(s, file_nb_sectors, - &data_start); s->data_start =3D data_start; s->data_end =3D s->data_start; if (s->data_end < (s->header_size >> BDRV_SECTOR_BITS)) { @@ -1200,6 +1203,7 @@ static int parallels_open(BlockDriverState *bs, QDict= *options, int flags, s->data_end =3D sector + s->tracks; } } + need_check =3D need_check || s->data_end > file_nb_sectors; =20 /* * We don't repair the image here if it's opened for checks. Also we d= on't @@ -1209,12 +1213,8 @@ static int parallels_open(BlockDriverState *bs, QDic= t *options, int flags, return 0; } =20 - /* - * Repair the image if it's dirty or - * out-of-image corruption was detected. - */ - if (s->data_end > file_nb_sectors || s->header_unclean - || !data_off_is_correct) { + /* Repair the image if corruption was detected. */ + if (need_check) { BdrvCheckResult res; ret =3D bdrv_check(bs, &res, BDRV_FIX_ERRORS | BDRV_FIX_LEAKS); if (ret < 0) { @@ -1223,7 +1223,6 @@ static int parallels_open(BlockDriverState *bs, QDict= *options, int flags, goto fail; } } - return 0; =20 fail_format: --=20 2.34.1