From patchwork Tue Apr 25 12:46:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Ivanov X-Patchwork-Id: 1773408 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=dmmrranF; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q5MHk0s4wz23s0 for ; Tue, 25 Apr 2023 22:48:34 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prI46-00012a-To; Tue, 25 Apr 2023 08:46:38 -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 1prI45-00011z-Mh; Tue, 25 Apr 2023 08:46:37 -0400 Received: from mail-he1eur04on070e.outbound.protection.outlook.com ([2a01:111:f400:fe0d::70e] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prI43-0000dV-Rs; Tue, 25 Apr 2023 08:46:37 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FfWLdQ4Z7x/wnkprY1H/3VOyWDsspOzxp9uPDINc/TdU7vhYqT9D/oioSO8BsENNLkElyu0t3CJfqKMReSaXCVZMe9QGv7YjMpyYIZT8N0CB/6uVrastuBo9qEB8jXGO6mqaMdV1JU6UWmhJgNv3lHtxVNQhZdbr/6I57DNLN6nuELh/myeYcmTxw52HKrmZeR0r3aQsTXV9F8A3IvnJckDbnzELuJqZ+Dl3MDqMgh3gWb9SmEiv5dszoypZh4Lics6r1JylOkxH2CLO1jaLXgft4mXC8e8YEbm0hNUQcq4hSrOHqbDD/lrhfqXYGnTu0ZWkzgsdcnp98A3fksRHHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MxUYf6aObS4iITGDY50zim4uxE7+oXyFe5i3tjss0V4=; b=BbPlxcUuVFfM5jWZ+Pci/pG0mnZf0NHcTyKO0f0LF2SCLXfaOucP8jMrbUVW9XXaRoz5SUWcNiZu75xwwN2VxOVXYS1HKiJ06vxdEOnwddVrwUfQA6d9AloMX7wKVYrPeRZRDrfDt5xonck3GGw87gr1bfbuD3IVN8myYoIqZ5MjEd31X+4L3/G1RXn2B7fQSoqbOsGYbfV8G+qOYGk+oNTP3lYvr/BGtAC9BWQlQZck+XcdvmEPHissnUV87460tthgP/49XYaR4pOQcgQt//qaYT7TmoccfqZSRfSVOwiVr/8idZGhJ9/b8rG2UWrPHHdq/inbFo8Y1e4GIgbDRA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MxUYf6aObS4iITGDY50zim4uxE7+oXyFe5i3tjss0V4=; b=dmmrranFTBoyQqkAKGFhkvKYa6cNZdNz2ZB3Yg7IxybxdlKGDhJJD1wQptdbQVpo73N3m4Af0uXA6c8I3haTFImEvv/mZozslg5/0G3LNvVqho6UP6T6iHJo5jUCUzkdo3jW513hy7LjOAEj0D0zJvGirxzwXtBSSnCCp8KC0lKgfAr0W5kROCVqlbP6tKTfmlCpn5yp7HY1qe7to1nYz2/s2dbYP6hfOi2VqHsPU7Ia4W0sGYOCni6VxwcD/5/2A+Xg/2Dzgxo9B5CNVljzpxPEOa9jVAFX5Un6Kfwd0EdRMNC5b49MQ3L+nbOUmzSLBjk1CjrAD/u6QoGcTLrsLg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from AS8PR08MB7095.eurprd08.prod.outlook.com (2603:10a6:20b:402::11) by AS8PR08MB9410.eurprd08.prod.outlook.com (2603:10a6:20b:5a9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 12:46:29 +0000 Received: from AS8PR08MB7095.eurprd08.prod.outlook.com ([fe80::b630:c4eb:fba3:1158]) by AS8PR08MB7095.eurprd08.prod.outlook.com ([fe80::b630:c4eb:fba3:1158%6]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 12:46:29 +0000 From: Alexander Ivanov To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, den@virtuozzo.com, stefanha@redhat.com, vsementsov@yandex-team.ru, kwolf@redhat.com, hreitz@redhat.com Subject: [PATCH 1/6] iotests: Add out-of-image check test for parallels format Date: Tue, 25 Apr 2023 14:46:14 +0200 Message-Id: <20230425124620.241022-2-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230425124620.241022-1-alexander.ivanov@virtuozzo.com> References: <20230425124620.241022-1-alexander.ivanov@virtuozzo.com> X-ClientProxiedBy: VI1PR07CA0238.eurprd07.prod.outlook.com (2603:10a6:802:58::41) To AS8PR08MB7095.eurprd08.prod.outlook.com (2603:10a6:20b:402::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR08MB7095:EE_|AS8PR08MB9410:EE_ X-MS-Office365-Filtering-Correlation-Id: 766010c1-fb06-4dec-a2b0-08db458b1715 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bkgwFlcjJYWjpY4jDIwRc5woA3s32LaVUkSkg/n8TK1h2y6dmegNWgIMTQtHOQ/rGHtH9HOZtnFHXf9UxE9d/jnhN0oEwg4PR67eiqOrBSBSMdkArw2/MKjfUauklAjyck1wasfZxV06QmFpeCMzNXujNV+SliiC/lw0aYkxLFBetmm3cOW1RyPijHeII4Wf7UUm5ehcA43tUUQvg2nrjq8o+s0mVOvTwHHbHT8S5FWkbfTF+vWqHjmweNHL+XxXMDFYtXel1fusxVtEpSlj6B0RDgqPqCtoxufEVA6Vagcku+ZADy9vcC/iUXaUN2uGa4x2NuDnR8ViMwwVSU7K22hm2eKam4DBEeYT1fUhdhZzfwcdPeX9j1QnBxbLx7OUxtEwsycqTg2K3EYLjHTrY12cNIXeQFAfHmRDFsHkaf1wJ/Wl+XG+FVZqNq9DSqKEszILfGnX1EL5flqNfFOS7FFt1AvgfQGt1vOotFPv4twqG0zsS5ORU+DewJU3iwNoGvcsLg9Xs7Ghy1fU9j+82YEqA5NQyadyxlu+GhDqEJpD5zozh7iNUi2ft7shxra49O/FngGfCtbR0imguZEYC1c/X1t4q+KWWZGd3x1Az1JcmGhZDepPqki4OtThnvzm7wwfmM0V0DsZjV5Th7htRw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR08MB7095.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(366004)(39850400004)(346002)(136003)(376002)(451199021)(52116002)(6486002)(2906002)(6512007)(6506007)(2616005)(6666004)(186003)(1076003)(66946007)(66476007)(8936002)(8676002)(66556008)(41300700001)(6916009)(4326008)(316002)(26005)(478600001)(44832011)(5660300002)(38350700002)(38100700002)(36756003)(86362001)(83380400001)(21314003)(2004002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qw8zB7gwjazrdfqnAZ3RoYW06qvr+qbuDLtr3QvoUNIFSqUHb39D6EAjDdlboB2uTrZ8YNNU10AFsd3oRy2AEDOYNHVbCA/IO81KH5TNiJbsb0nKvWJO3fdz9vxaUYUPwgJzldm81Y8uNleaZAuSpGPUP2AmKRyrS/hh9i7q9nJ0tqWr3xeJiuWDyMx0ZveVKPiCpeWGBCeulTzNC5JaIgaszvMULPFge3x641cc7Tze6qu73JqbjRQNnyJ8RtHXkScDsC43Dkm/F3k8YJWt7kWB9r3gEQPufR74qBsIk81yMzonS4xoLHrcEyVCilCB6Q73kbRJNwtQA7jSPZtKLeO1Qhw4F44hM/1RbIT3K7ugjyLRHoN7j7Df0ZXCcp7H9uyjjmc6ziGqovtRKo4ubZuPk2FXtmvYtujpJMWctJtUiDJfvSehbAAqiDbGTBNPENuRNHZvZHMW+sMCtl41rm+yUXpkkHGDuY5M0KBFTWYhvIw/sxyWQPNUiuBujFvxeYIximTPBewbRqWTulBosHJarUV0X9em3MMkJ9hcS00qfiFIwIdSnR6gkyN+cJJq3tSe4I3toybu8txw0MWjs0x7gNvXT4ALC3G5PyXvJhmp8Oe3wms+bDAsZaoM1JEaLZvBovq4SzLPWbxz7m0JqqpwlKM0OyFXyOdz3/LxcMwZzqP711HB+4+BwQKCdWG478R96XgoDwxxhhV/hhd1U0KPyGcc3A7ZU9V+s+YiMWqlOuTkFHB7gRM1kA1R7HZdAxOWH/b3PKvTdzz3Pv3ltg9Ca76IhGfE07Gj15lQOPu/DdAT4FlKeOfUgnYdKhLosxKA5Pfeole/4teVJ6pyNcnznxuTVjoAEO+SnG3oNyq2kdpq6kyGmIO/Vi6Rrojkvypb3EQEEVgZbfvoZcHblHdntl1EeSVtcHkCkljrN/ICvSTHw00xGrEravhyZzeCpp6tuXgdQ2j5IEVR4pvN9BEGUwhZNBpS5ZazCDqIXjW+j3GB7bSiPGcKH3pHV8vlvXyWDXtPf1qKHjtnkhZElegDSC9YncA+8uZOKR5YKnoS0FCiaUGLHM/pgInS4SkS/RgcuhND6hKrOIOzKs5GMhv/fC8yBIm/pwJHrztJFLFgc6r4G2bECZEnxALvLsx9c39b3kMv1XwayiujX5Ny+DbLJw7kNmyrHuDC/ZbfN42ev2CddCBBm4QjLTjXhIGQ5Wsovtj8nFIhNGk/6Pb91Pweezjy3w6jFiLLgsFTP0kYLarQiiwCQObd2E7IZPI2GtIwubs4CtnN5nkXN6r1Caai0iINjcpQMZRy4VXQs5xqEjMQTLL51isATsHc45pXqyQmEZJASPee2rSV8IwphThfJisIs642MONv23+PDgXzn8vEB7rwEcnxype10rQvPRJKnuSbiG8lXJAPKyde2Aw2eEqJEcPPqAFKp78n2sYPi3AjGyHLE10+GeLvAOMNy1zoRl/zKCVa11bO+Ur/3UxM2hDlufgD5WULKvc//xGOx5sbhUUvzgfCebIIGYa5+EzABuohayxjhaGe2rmJAwyVIJZoXAVNQ/qgr8U/U8d5sTEoUmoH1M79oIG2eijq7yMUweUXyz5QphtEB/bqSg== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 766010c1-fb06-4dec-a2b0-08db458b1715 X-MS-Exchange-CrossTenant-AuthSource: AS8PR08MB7095.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 12:46:29.4863 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Gs0VNn4SUnn6VqWpIQGRgOwSfeoB4OR2M+cE+bmau/r01aDZgVwtODCvKxVt2Vtfm99KeZRQd7KmnwiMJeuXVR6MnvXhRQ9vXbR6Z/4EUqg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB9410 Received-SPF: pass client-ip=2a01:111:f400:fe0d::70e; envelope-from=alexander.ivanov@virtuozzo.com; helo=EUR04-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fill the image with a pattern to generate entries in the BAT, set the first BAT entry outside the image, try to read the corrupted image. At the image opening it should be repaired, check for zeroes in the first cluster. Signed-off-by: Alexander Ivanov --- tests/qemu-iotests/tests/parallels-checks | 71 +++++++++++++++++++ tests/qemu-iotests/tests/parallels-checks.out | 12 ++++ 2 files changed, 83 insertions(+) create mode 100755 tests/qemu-iotests/tests/parallels-checks create mode 100644 tests/qemu-iotests/tests/parallels-checks.out diff --git a/tests/qemu-iotests/tests/parallels-checks b/tests/qemu-iotests/tests/parallels-checks new file mode 100755 index 0000000000..055ce34766 --- /dev/null +++ b/tests/qemu-iotests/tests/parallels-checks @@ -0,0 +1,71 @@ +#!/usr/bin/env bash +# group: rw quick +# +# Test qemu-img check for parallels format +# +# Copyright (C) 2022 Virtuozzo International GmbH +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +# creator +owner=alexander.ivanov@virtuozzo.com + +seq=`basename $0` +echo "QA output created by $seq" + +status=1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ../common.rc +. ../common.filter + +_supported_fmt parallels +_supported_proto file +_supported_os Linux + +SIZE=$((4 * 1024 * 1024)) +IMGFMT=parallels +CLUSTER_SIZE_OFFSET=28 +BAT_OFFSET=64 + +_make_test_img $SIZE + +CLUSTER_SIZE=$(peek_file_le $TEST_IMG $CLUSTER_SIZE_OFFSET 4) +CLUSTER_SIZE=$((CLUSTER_SIZE * 512)) +LAST_CLUSTER_OFF=$((SIZE - CLUSTER_SIZE)) +LAST_CLUSTER=$((LAST_CLUSTER_OFF/CLUSTER_SIZE)) + +echo "== TEST OUT OF IMAGE CHECK ==" + +echo "== write pattern ==" +{ $QEMU_IO -c "write -P 0x11 0 $SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir + +echo "== corrupt image ==" +cluster=$(($LAST_CLUSTER + 2)) +poke_file "$TEST_IMG" "$BAT_OFFSET" "\x$cluster\x00\x00\x00" + +echo "== read corrupted image with repairing ==" +{ $QEMU_IO -c "read -P 0x00 0 $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir + +# success, all done +echo "*** done" +rm -f $seq.full +status=0 diff --git a/tests/qemu-iotests/tests/parallels-checks.out b/tests/qemu-iotests/tests/parallels-checks.out new file mode 100644 index 0000000000..ea4dcef0a6 --- /dev/null +++ b/tests/qemu-iotests/tests/parallels-checks.out @@ -0,0 +1,12 @@ +QA output created by parallels-checks +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304 +== TEST OUT OF IMAGE CHECK == +== write pattern == +wrote 4194304/4194304 bytes at offset 0 +4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +== corrupt image == +== read corrupted image with repairing == +Repairing cluster 0 is outside image +read 1048576/1048576 bytes at offset 0 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +*** done From patchwork Tue Apr 25 12:46:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Ivanov X-Patchwork-Id: 1773404 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=ViR659dk; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q5MGl6gjgz23v5 for ; Tue, 25 Apr 2023 22:47:43 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prI4A-00013t-1v; Tue, 25 Apr 2023 08:46:42 -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 1prI48-00012x-2y; Tue, 25 Apr 2023 08:46:40 -0400 Received: from mail-he1eur04on070e.outbound.protection.outlook.com ([2a01:111:f400:fe0d::70e] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prI46-0000dV-Ez; Tue, 25 Apr 2023 08:46:39 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jxt6rOA4I+Di5vA2zdlLlgcYsAjFlZ5gmTsjXrHj4zGD76F3v7BQO33NgCaiYfMyESR7nCBQ06cjbiQ64BHCl17w5o26JREYpWEjXFrOXmwUnOs8wVdbg8h3OyaagiDGctfoCrjEeBAzz22iaIQ0dFZzqb2AwuF95TIecRwWwovDpm3XMhKgKR5BLKAAEWfjr/N8Ey15MaGtOK08uKQCkDZ+hcwqQ4yD7q2jiYSkeMudBLINT21Su9DjbF3lKWA7Bx67iS0UVKH22VpzlUYud+vH75N/VKGbrjo6M5rXysUDuGdiBGnlZ0W8YnxYtgy4gSlmzsMi7RNN0zoQfGa0IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hEe0eihCeuFAUQQRulF0qttAaOppAZRgF56WPxz05os=; b=Jk7kr1eupcCaOGRSKry5Dcjb2ctbpUlhfqASd9BWbLG45Y7Udw4elynSwbWv87CHDinuTAM9QjzKjJSKbI4ilXUz7sNstoFPeWpFRtlnN5cx3rmbZlu3lu9POW3C3x2giPNMzyyOlTjxsfYia36Wew2V7IaGtZo3N5b/+fi7qkQ3U+RFuJUlQ4mxuNwQ1m/rjSneU53NfARgnd+44rVI3ImJ8EcBxdKpToRGT8t7w70SUofNXVAShfrqHjTFiBrR91iuWfSjmmSMm8y15Yrc+O+majejF1ygkaa0AuOQls2vG8OoNZPJOLcl7YgvEcZoxL8J+eE7EiGOQN3n8vUJqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hEe0eihCeuFAUQQRulF0qttAaOppAZRgF56WPxz05os=; b=ViR659dkd4rRUN1Dq1hx5KdQc++htRMkoT6HDAFUuv9n70mj3yMXIOlxSC5ViiydOmUPAcsB6qcbqGlE/W+2YMfDShnD774EhPiSpxb27P7n6/QKcoe1ielz+JKC3x+GckX1z1UQnaiFExfbskwOtXl51WpsoLIatyxp0CU6Yw3m5hk8/S4wowmuWKGvpCHuOGoPdHRj2u69o4PK9uZtpauJwlWC9nauoW/tYdOt1iXyitMU1asN2AKLiFLjf4j+jmSQnHi+mAwDHn8TuowGvRVryILx2MILF5Rjj7aZzeyArQPc2Z17piyRQlhEPXas3/QP9cG6Qy1E3kbmdIvrgA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from AS8PR08MB7095.eurprd08.prod.outlook.com (2603:10a6:20b:402::11) by AS8PR08MB9410.eurprd08.prod.outlook.com (2603:10a6:20b:5a9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 12:46:30 +0000 Received: from AS8PR08MB7095.eurprd08.prod.outlook.com ([fe80::b630:c4eb:fba3:1158]) by AS8PR08MB7095.eurprd08.prod.outlook.com ([fe80::b630:c4eb:fba3:1158%6]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 12:46:30 +0000 From: Alexander Ivanov To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, den@virtuozzo.com, stefanha@redhat.com, vsementsov@yandex-team.ru, kwolf@redhat.com, hreitz@redhat.com Subject: [PATCH 2/6] iotests: Add leak check test for parallels format Date: Tue, 25 Apr 2023 14:46:15 +0200 Message-Id: <20230425124620.241022-3-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230425124620.241022-1-alexander.ivanov@virtuozzo.com> References: <20230425124620.241022-1-alexander.ivanov@virtuozzo.com> X-ClientProxiedBy: VI1PR07CA0238.eurprd07.prod.outlook.com (2603:10a6:802:58::41) To AS8PR08MB7095.eurprd08.prod.outlook.com (2603:10a6:20b:402::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR08MB7095:EE_|AS8PR08MB9410:EE_ X-MS-Office365-Filtering-Correlation-Id: 99a385b3-d562-4f1b-0b7c-08db458b17a7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D/Pzmnyyf+FhaoBA+J8GrAGXkhpdzo2cIhJMs8SAzIB0dk7FYsN6ZuHzrIJLmHiOmQm9tggVD3Z3CQyPbsVXAS+o7NnCF5I2+0ufFPefsDOf1+7Bms/Tde366pGZ4dtdwC4oRFh6kNOjQaY34TMfIqsU7FMSOSN0/d48SqZzsOXs7ZBMOeEBwzTPesq1GtFpitEX0ZS2gTojk/YgWKwxBpIwDUWWVTWE+m1CUaPPkU4HH38RehbPafz8QHBAbEb6oolbOHnEXD1fuwiIEciNIdmngmRlzhm8jToi7O/lJkZZoXVXqDMN8dlHVcq375lOv8UaCU8BnSoAPJcELVEHAPnVG5jngWCS/vYjDntlPVBWZhLKml1e0m6LrlDumzVQYyYm5g7nPevEAUlVzdq4UegBZ9N46ztj8c2voRPikVE+s0oWi7RZfTXiWX/6qHynrjZhLftbfki3GHttgU53GWzMkBGRbXhkWroXuRlkyzS5q1uZ6SyCxaoU3S/FHCPZiI0OxwGeCLSfmtKibvaO0eJZQPu/8o/YTmuCOEyvPdawUwYMjQ2N3wTAQhAvsSF8ImJGB30Wvbo4V22kNsvEpyitUhnsK71IWGtpTNDFh06tZd6B3EQn70xVu86aXdxaJpeCwAjNmPSs6xAtZ+XPtQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR08MB7095.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(366004)(39850400004)(346002)(136003)(376002)(451199021)(52116002)(6486002)(2906002)(6512007)(6506007)(2616005)(6666004)(186003)(1076003)(66946007)(66476007)(8936002)(8676002)(66556008)(41300700001)(6916009)(4326008)(316002)(26005)(478600001)(44832011)(5660300002)(38350700002)(38100700002)(36756003)(86362001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lC+N7Qi1JCnOP4W939HuLxP1BGP93w61b5BBuZEAF2819U+nPtaIRw22mLPuEAasxjhnrkZtgNAn/4kBRa3IAXnoUzz1hGymzYqApYjuRXWUwEDSv2VlVeMu6olAo/VOW7t1k6NofmJMDDI49YQpCZumcs2ovvzQOIUwtYz+bYmOq614mCKDb102pkf2z/20lA9aYmMXvJe/3mzFS4K3V/uzWaa3V4fmY8vMn6ZbFuUp8p8wtx4T7GvQTDlFp8q60UKXc3XRRTdmb9ks2KbDTGVz9ONC9ulzVZEJ74B37IEt9sLZgAxCJJpeE4mkv0eUe6iqAKIMvqz7Inph8e/5B2sbus/q4J2C7d1Esu81sCfekqId1oeyW5FEJxQb7WOyiwzzXJcPFDPjV/2YxhwUDnxOu/ZaDhh5q834oWfD6jnOGS89XJS8LzXZ7t0BLRhdPjBy5ETRW/U2BESb7A/bIQBrXMATaui4VVBxgWtyIVj3/mtj04ApCc/BU6ttuw0uQhkEh++coUSJVjGJO+AeXl1k7/Kpcv9F2TRxQynbLb4HnksVRIkjiUOy4Yd1IA5H1XEVQ2U6KyDZg8Ddlb5HieHtjzPKkcABvJBud4+yVUeWMDvggLFAbt0ayVARC5mGMtNDwUuctjxeNMeYuQG+C0N0vrTN1t87/XM8ASLR9ZPbHSgnu3Znwv/LShATzEe8LrvpfZJFlURLwFAfZRQG/tD7f2VBY+ZV4J+QaCwOSBS0lFsKrS0mWSS4SG2S0K0AHf0DuO0lZwnsDFUP/YasAIEWHUbnD7uKoopbe8EgMZrPmyGp41p3vgaX7WvoVKk/+j5nF9sa9c56t//7e7A4iaSZ6jDe+Z1EZFa+it2cpn1N0A2v8oL1AUvqIU1T1wOop2Ff0LLvIpNg7i7LFGjuSC2SPSO0dhI5KNZntklBFWTfQNQcAJr2XoVJpqloGHEo3sJ0CYS34lSGKOSlBep8yBLwE0XxXYEsy9WhWU+TKzefeN+cdURVOf1Ogsp5xIHrYwW6JJwj4bIY/1TSnODKiHIopWeUnm2aHBcFpuosu7JinwOTQUs0+BJfpZ+nftVLnO5k+EXu+OOV2qhGmWH6Nw3IOsPoN2MZDmLARzrCfD7/+SmUBRpPix14tfm5llUL1ZtY4zD2DcPmkfRLP1E9ff5yKixYk2G1uADNIr75KH9cD8pwxov90P8CKSatAmA8oU/tIrsKqcWkMS8C8hZXF5txXGrG5c0dr64hduzYBpmN6zPLAjD4rs+VyXFCABrQ9HyxTm8a/kIuDcS/Ob7YBl6ZU7gDE17SLaVIxVgRiWC+kRoe8AMD4ZIlm/heeiPW5B6vrLEdGqOcg4xuxSTADzwk7SeXaNgeEV6XaCzPSGDTz0jT0lu4TcNGVtUEJpDJueUTGd1DnquBWbEqZCNu1Zib/ZryRRGZAveBI3r2kDYeNJAtXON75BRrtu60i/A7LkHUiZ+NPq/UmHtb7QlG0R6cqtjlljF536umqUgxI6d8JFB2suJm/y0FobLUhS9uU2Iev4M6BWlNPQRw4k9b+cWZG3FHKiHe0hbweAfRnG2y38e/dvcTC+Y2m9+iF17UJMW29vHhyfueI4yJ95Chjw== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 99a385b3-d562-4f1b-0b7c-08db458b17a7 X-MS-Exchange-CrossTenant-AuthSource: AS8PR08MB7095.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 12:46:30.4022 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kqMkl0o6AplxrUkewP3pLHrFBpfohZdOEv5WHLNiE6pC7Uc6gA8YC2tkGoT6m6JX6ouaQjDQxjIIKuiJ+L30JupqfYyrjFTbzm7iTbWgxFg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB9410 Received-SPF: pass client-ip=2a01:111:f400:fe0d::70e; envelope-from=alexander.ivanov@virtuozzo.com; helo=EUR04-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Write a pattern to the last cluster, extend the image by 1 claster, repair and check that the last cluster still has the same pattern. Signed-off-by: Alexander Ivanov --- tests/qemu-iotests/tests/parallels-checks | 27 +++++++++++++++++++ tests/qemu-iotests/tests/parallels-checks.out | 22 +++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/tests/qemu-iotests/tests/parallels-checks b/tests/qemu-iotests/tests/parallels-checks index 055ce34766..8be282fabe 100755 --- a/tests/qemu-iotests/tests/parallels-checks +++ b/tests/qemu-iotests/tests/parallels-checks @@ -65,6 +65,33 @@ poke_file "$TEST_IMG" "$BAT_OFFSET" "\x$cluster\x00\x00\x00" echo "== read corrupted image with repairing ==" { $QEMU_IO -c "read -P 0x00 0 $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir +# Clear image +_make_test_img $SIZE + +echo "== TEST LEAK CHECK ==" + +echo "== write pattern to last cluster ==" +echo "write -P 0x11 $LAST_CLUSTER_OFF $CLUSTER_SIZE" +{ $QEMU_IO -c "write -P 0x11 $LAST_CLUSTER_OFF $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir + +file_size=`stat --printf="%s" "$TEST_IMG"` +echo "file size: $file_size" + +echo "== extend image by 1 cluster ==" +fallocate -xl $((file_size + CLUSTER_SIZE)) "$TEST_IMG" + +file_size=`stat --printf="%s" "$TEST_IMG"` +echo "file size: $file_size" + +echo "== repair image ==" +_check_test_img -r all + +file_size=`stat --printf="%s" "$TEST_IMG"` +echo "file size: $file_size" + +echo "== check last cluster ==" +{ $QEMU_IO -c "read -P 0x11 $LAST_CLUSTER_OFF $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir + # success, all done echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/tests/parallels-checks.out b/tests/qemu-iotests/tests/parallels-checks.out index ea4dcef0a6..f2cb6dde85 100644 --- a/tests/qemu-iotests/tests/parallels-checks.out +++ b/tests/qemu-iotests/tests/parallels-checks.out @@ -9,4 +9,26 @@ wrote 4194304/4194304 bytes at offset 0 Repairing cluster 0 is outside image read 1048576/1048576 bytes at offset 0 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304 +== TEST LEAK CHECK == +== write pattern to last cluster == +write -P 0x11 3145728 1048576 +wrote 1048576/1048576 bytes at offset 3145728 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +file size: 2097152 +== extend image by 1 cluster == +file size: 3145728 +== repair image == +Repairing space leaked at the end of the image 1048576 +The following inconsistencies were found and repaired: + + 1 leaked clusters + 0 corruptions + +Double checking the fixed image now... +No errors were found on the image. +file size: 2097152 +== check last cluster == +read 1048576/1048576 bytes at offset 3145728 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) *** done From patchwork Tue Apr 25 12:46:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Ivanov X-Patchwork-Id: 1773406 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=W+8gCCaQ; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q5MGm5jnJz23v6 for ; Tue, 25 Apr 2023 22:47:44 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prI4C-000156-1A; Tue, 25 Apr 2023 08:46:44 -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 1prI4A-00014U-RM; Tue, 25 Apr 2023 08:46:42 -0400 Received: from mail-he1eur04on070e.outbound.protection.outlook.com ([2a01:111:f400:fe0d::70e] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prI48-0000dV-RX; Tue, 25 Apr 2023 08:46:42 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VSUYyKzhla3kcUg5W+8t3mY+0LIplAOE883hM3904gkWZ+t755LKlGhqQpxpLgEKW2N71imtUmDiHatdK72E0ir2c/bEbXGe47gTPY016mZrc/sfjr0+YRbN7ZZzFRNzqRdytR6d40ZR8L5bYY0Xy/P4zTMEvtZyX528yi5nHfCCrX5ARNwxxBL3U8gMBGHqnilXB+1qASP3I0hK0sr4Cknn0WSozcZQ/oYk7sEX1Vi/ofb+L8Xw24ET94VYCkCvG5uUZrXuySVFI5Ghb9NRAguZj5GhoMXA/L1fvlUDbW447FvuzMMRjVs9FUOGvJDpCLpedlE2MbE+rsHsufV63Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9C+biTLzNtKfdPkwSBMIbxNZ+DoYLugwnx4JnH826dQ=; b=Jb5ai8FKBO4DDIJ8dt8vBxRZ7ZAzYjKnseQaqPdW9FYPTDxAD79PskwCBZKfhU3pOi6HRgOKu7heiN5Bp4BK7/f4YpTXQhaxplZEvs29n7GGaMjP8tPzPIOXBIIJQNso4DBb1libvo0kL6+OnGSDFMGypcBOEFwec2Kh7svZec/bHgVl/8NFRGJg2tGutlprnx6r7Ukne5oxFrJdWKr4upRaqWGN2uW57xsEY/jmHNt13oW06X42SXrcX8OByQXEE1ZUwGIyOJFUl0Fe41Bf9fBZOuutSnUJn0i1jBYFhBycPiML3QG1FoSg7coodNnDk6XbdNpOJRD7h6azkJi7eA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9C+biTLzNtKfdPkwSBMIbxNZ+DoYLugwnx4JnH826dQ=; b=W+8gCCaQH0PDQYs7xFEizQUxfaClf21ASPqakt9pliXcKM46oSB3mokILp8mPpRfGAM1RaHPVuqvWAg++xDPfEQKOkIcAtNHoMv5QiGY9icw+rcweTEX9o+d4NDs2TLoxPzKSy4cjNYxlJPLBLzR2RZ/vpcSucFDlPWgAzW+qA9/9oue/FELVzwNT9lR2uacyqGl6DrrfofXU9JMf8+8NjomtDlF9X18i4so9ZXNGPlnaHSVhcYtK7uCT5BArXJs3x6wHzQSTQxx513ywgD+GTFBhLEIL06jb9W3VtM/QnM2j6ueDNwmSx06vQpv+rfiHyaf9BKx97YTpNWJ1z7VNg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from AS8PR08MB7095.eurprd08.prod.outlook.com (2603:10a6:20b:402::11) by AS8PR08MB9410.eurprd08.prod.outlook.com (2603:10a6:20b:5a9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.33; Tue, 25 Apr 2023 12:46:31 +0000 Received: from AS8PR08MB7095.eurprd08.prod.outlook.com ([fe80::b630:c4eb:fba3:1158]) by AS8PR08MB7095.eurprd08.prod.outlook.com ([fe80::b630:c4eb:fba3:1158%6]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 12:46:31 +0000 From: Alexander Ivanov To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, den@virtuozzo.com, stefanha@redhat.com, vsementsov@yandex-team.ru, kwolf@redhat.com, hreitz@redhat.com Subject: [PATCH 3/6] iotests: Add test for BAT entries duplication check Date: Tue, 25 Apr 2023 14:46:16 +0200 Message-Id: <20230425124620.241022-4-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230425124620.241022-1-alexander.ivanov@virtuozzo.com> References: <20230425124620.241022-1-alexander.ivanov@virtuozzo.com> X-ClientProxiedBy: VI1PR07CA0238.eurprd07.prod.outlook.com (2603:10a6:802:58::41) To AS8PR08MB7095.eurprd08.prod.outlook.com (2603:10a6:20b:402::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR08MB7095:EE_|AS8PR08MB9410:EE_ X-MS-Office365-Filtering-Correlation-Id: 129c4c86-f3bb-4106-d686-08db458b183a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /reR8pFACKrPpm2cl32zW04UgUgZkXM6HkoHsw4XLcViyccKletIi9xNPE+0pifi2raShhw2DTPro3kIwD0qpXVMMhncOI2jlVD9vrc16P6AXsX8dgw6/gWw3YS9U3rO8tmRi2QVMbmy8qnJgLw9yMXxLAVD23MPJ7KvAQxIaQHYamMBiPacwqLcjnPx+x/97V7nu1elsVNI+v3SIcH05s3dW9oKFYxugcYYA7Lzc6nXagTQHmsDUnPoOg2An6ohm7G4X8KFIHIdPrtrLXyJjI7zNmAVifxxo6//TyhRDHW7mYW2WwgA1oWJDDtssZ0Nyb1VNzWAKuSpz+b/0qDq5ZszliZlzBiURp5KNr5i4twqFxVCE39ZNcoOaIr6yNbDQ7J3NqCYb7nRTxIoNW4eeD8sjk/4v+7a3iWa4AN3xHi7F4HgMRKnjBiX34ZRQEv8zxllhyxJtVRl/znhINEdd/eAvFt7mMU0WInr4SboisYjo2K1zMFzhF2CyChd3EqSoHNdcJdUID5a0FiHxLf7UUIwftKoyc6OvdIxoezqAhkICa0GgqHx1sV15xmUNCMNiDldUPTl1BocCFDc2bVrGeu2Gp1WLWQvWPCd0biHYD6nmJqXXZMQjFYRcGjAphWGcm6WIBlnmIhXZw6M/Lgttw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR08MB7095.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(366004)(39850400004)(346002)(136003)(376002)(451199021)(52116002)(6486002)(2906002)(6512007)(6506007)(2616005)(6666004)(186003)(1076003)(66946007)(66476007)(8936002)(8676002)(66556008)(41300700001)(6916009)(4326008)(316002)(26005)(478600001)(44832011)(5660300002)(38350700002)(38100700002)(36756003)(86362001)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4DH1vl8iuo4MVUd9UbDObYg0R8xp/OBBoHiKMKV1zWti+ccIePzFxlTBXbpXd7T3viLSnOWR3fOc85tuRBdIVvLIJkFRETrvleL7SOjKCHnu71tf/fNWa9TZ8C1kn89HtavsN4l7sxeQrZ/Zs1fiVIfxrYo0uUFm4yfrA+hawtiTGXEzYySMUhNL9xwVMCs9TeMvv2tvOdU7V5awSUEYQqx70ip6qLuPaa8HaPflWtMjsBN6RxAVJ5Q/gmAlkHfF/dac2KPWHBJhAYpv96FJNMUyjB6lvz+8u/3jkxo3Sqhs0RRrPkMfPMp6rr9fj5gWdYxvT7LhqFkeUrBI5AxsrPlg2dUSoC7qco65z8JK8jW/vSpljYd6X8T2JVFzffDHFJcSCKw7udZvqO7dC9LPWB11ctDvJvHZ+8BZ93u/aGTc0ahaAQIsxajisStOamlXZp7uG7Q+i7Sc1XsG5PAvP14XW9QocjVuHHjzav+f4mkcH1vaLwWw8Hn1Ga+IUtrqYDSyfNbz0uQp1bdnQT3+KKckOOZW6gTYnEobgXenIvrLrja8Tl4O+DYzmQB4Wzx49HK26oUz6de9HDlQNI8qCfZO3aabyvWtG/+IMB2k8lKdM7d88Y29jCTMkuylj+rsOkLEBUte+43zmXT1Q7/GBwA8/00uG3MJdSPyBoFAP2ffErzIOmcYIXYN/1KE92AFhX7+z5q2x0UE9cJGfflYppI07imv0IkDuNRZ8uEFTraGHux0JBbifjETwRAaIUzg1iddvgDb0Nl1rJ/0XSTSJQtCPX2zYd8AT8XyCZfyKKBelFuYCpKG4i0D5+BxKkDHw6EzBM5I4aTqfm5j5hPEBB7BKDlozdRyyhg2v0iUy+pLPC7XXhb/5VPlXOSEGjhamxFmrGN0Du9SMrshQy85gDtLKYMuYBUqJGpIu7Tt4Nzc/rwKrn9a/zyDNa5NRkEYGa1Z70tMEPqB/qJiLT2LbUTkr4D+OxspSULiiqyfD/geuSeMt4nNfru8bgzA+dN7hhtgrgP2R2uuKAuJwCROe3zEbUdGPmI+9r46f1787vQRiRQXFhWCMkAIplE6FhSqaPTQJLiMAZ1clJka0EqcVycGK1jbFEPbqyLfi5JyBBEO64xt3Ce5Tk9HvH9ut2/VAhwCCYgaRrFCMikayMMVrRLkEicKOwK6SxhoyfajsPBAqyg+ZqbyXDaAWeThWhO3HGHRGlCu9gqIYojwDz3s5mLTW1xvAfv1hp7OxoBbcmnP+ype9E0U9dZb9OKUt7Hr04wkJntHtBQERh/Cn8ZT6s7POnzXQTwDBQ6NKMVoinfVlt90P0L4HGxEJv+rwPMpagBDdSBvPG+pyumwQGeyOzMhyky98ZkHl2t7Xuzil3BRKtzrvusd7bJPrPMuRVqJsIgBQSC0cua8FqgPL2T9zvHf5l4mlajKMAQd4wXbtQDxyV+kPe5ElmQ9r+G9ZN79q/VbH4gAYCqb6SVuYlOQKbobypQ7hUSJEfAMf9P2Nwji7VpBvxqLbGonVbtCzDbsDS77rAOyOzvUbgqu7Wb/IpVIjyb5e/Gfjl3dYDBsGXvFXDQXQibwwBBColhKyth+izrPfOo5OFVfinwcFKly0g== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 129c4c86-f3bb-4106-d686-08db458b183a X-MS-Exchange-CrossTenant-AuthSource: AS8PR08MB7095.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 12:46:31.3767 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YcLBsa/4ajLfAS0B6L14K7yYSenym27naxIrV8H8NoaI3iviFHw/4Oj/PhMAZ6vD+UIgeb14UVQ0FWHMZKRstqCHzmZ4ypbTsOo5FvtrV88= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB9410 Received-SPF: pass client-ip=2a01:111:f400:fe0d::70e; envelope-from=alexander.ivanov@virtuozzo.com; helo=EUR04-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fill a parallels image with a pattern and write another pattern to the second cluster. Corrupt the image and check if the pattern changes. Repair the image and check the patterns on guest and host sides. Signed-off-by: Alexander Ivanov --- tests/qemu-iotests/tests/parallels-checks | 32 +++++++++++++++++++ tests/qemu-iotests/tests/parallels-checks.out | 31 ++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/tests/qemu-iotests/tests/parallels-checks b/tests/qemu-iotests/tests/parallels-checks index 8be282fabe..8a63c3daf4 100755 --- a/tests/qemu-iotests/tests/parallels-checks +++ b/tests/qemu-iotests/tests/parallels-checks @@ -92,6 +92,38 @@ echo "file size: $file_size" echo "== check last cluster ==" { $QEMU_IO -c "read -P 0x11 $LAST_CLUSTER_OFF $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir +# Clear image +_make_test_img $SIZE + +echo "== TEST DUPLICATION CHECK ==" + +echo "== write pattern to whole image ==" +{ $QEMU_IO -c "write -P 0x11 0 $SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir + +echo "== write another pattern to second cluster ==" +{ $QEMU_IO -c "write -P 0x55 $CLUSTER_SIZE $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir + +echo "== check second cluster ==" +{ $QEMU_IO -c "read -P 0x55 $CLUSTER_SIZE $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir + +echo "== corrupt image ==" +poke_file "$TEST_IMG" "$(($BAT_OFFSET + 4))" "\x01\x00\x00\x00" + +echo "== check second cluster ==" +{ $QEMU_IO -c "read -P 0x11 $CLUSTER_SIZE $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir + +echo "== repair image ==" +_check_test_img -r all + +echo "== check second cluster ==" +{ $QEMU_IO -c "read -P 0x11 $CLUSTER_SIZE $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir + +echo "== check first cluster on host ==" +printf "content: 0x%02x\n" `peek_file_le $TEST_IMG $(($CLUSTER_SIZE)) 1` + +echo "== check second cluster on host ==" +printf "content: 0x%02x\n" `peek_file_le $TEST_IMG $(($CLUSTER_SIZE)) 1` + # success, all done echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/tests/parallels-checks.out b/tests/qemu-iotests/tests/parallels-checks.out index f2cb6dde85..b747bba1f3 100644 --- a/tests/qemu-iotests/tests/parallels-checks.out +++ b/tests/qemu-iotests/tests/parallels-checks.out @@ -31,4 +31,35 @@ file size: 2097152 == check last cluster == read 1048576/1048576 bytes at offset 3145728 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304 +== TEST DUPLICATION CHECK == +== write pattern to whole image == +wrote 4194304/4194304 bytes at offset 0 +4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +== write another pattern to second cluster == +wrote 1048576/1048576 bytes at offset 1048576 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +== check second cluster == +read 1048576/1048576 bytes at offset 1048576 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +== corrupt image == +== check second cluster == +read 1048576/1048576 bytes at offset 1048576 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +== repair image == +Repairing duplicate offset in BAT entry 1 +The following inconsistencies were found and repaired: + + 0 leaked clusters + 1 corruptions + +Double checking the fixed image now... +No errors were found on the image. +== check second cluster == +read 1048576/1048576 bytes at offset 1048576 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +== check first cluster on host == +content: 0x11 +== check second cluster on host == +content: 0x11 *** done From patchwork Tue Apr 25 12:46:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Ivanov X-Patchwork-Id: 1773407 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=NzEQxGKb; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q5MHR1vcVz23s0 for ; Tue, 25 Apr 2023 22:48:19 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prI47-00012i-Nq; Tue, 25 Apr 2023 08:46:39 -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 1prI46-00012B-DN; Tue, 25 Apr 2023 08:46:38 -0400 Received: from mail-ve1eur01on0722.outbound.protection.outlook.com ([2a01:111:f400:fe1f::722] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prI44-0000dl-Ik; Tue, 25 Apr 2023 08:46:38 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lKLHooyPv1kDHDVvDO1M0KZRcc8OxDN1t8UsiFg3KIXqQLhmORz+kMOcrt5e5RfSR1wZkmZHBDOflwYaOrlM8knf87WkleRaZzZ1qGt64YHoS3r0PbW63THqtZ1Q6CZfmtRKr1FyRtyEPr3wiXm6zJd1XZfwIFeC6xmSbfaxXsUi+xfoPY5R41Ko13wSh8SX5N5Rre2x5idqpQxUU+i9LpCknJzYmsWNhsOVkL6Ivl4b7f1rGT2zzT66bd2C2B3p4LAkagEsnxmHObUO8g62uIIyeIKyXWhZSXuxcRoM96xRHZ7wOENMVUUiQNI5o3qaA1kyBs4DlV25tTo2NlgxGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uk7I4dAzmdN29D9AIJXGJSiGT8T8bEMxyKtmA16X+IA=; b=KNlLwpMJ40aG71Tfh9k4x6vnla6Ro8ZxxSM8gWHnVGtbaZC6Ac2i6n90eJUvRM9DtRPPFZ8EujO+UV+V0fw7xK1Pprnsw1IvYZAzS4KNEZxyzlVQWf79ATZkRfc31U/1fnKi54zvRINLuI+SwCFhJGxpMV6u8ScbIvLy0h8rNhWVqDESFp0Rh+Oz8l05dPIyayYOY9MK3u44vyjHoRFJ994b8oRZpREIaSQeEMFjEkxMEDhJhtxJHRARFLAtLL4raYRsGT4lWkaGwi3QhwazZg2V+L+/fE4ml4pGUOGwBV8iRJGAhweCk56qNvQ+LZqgk7i7uK20+1eE5vqkhf8SEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uk7I4dAzmdN29D9AIJXGJSiGT8T8bEMxyKtmA16X+IA=; b=NzEQxGKbKfRvoZi7vYrA0FRE1Fz9TMFWFHS9u3/RxKXT3Rp3yf00/7vy5ycMh6LdrDAlrym/BmtOSuyDlOVbg+y31MEdO7H3uwyrSH9/EjrK71Kakbriv8xNkV5NX8acHQN5HkoBaHPiuzKklYKk3UUhyNOFBQRIN0A88DIPBgE94hfyD+IXgG1IMHa4c9bP+FDPYfpqX3RHj5JA9v7yh+6M/gyNa0QFgyHfsvKVciVaGWPCTDQrO5nwx3nkkO2Uakv+q/qrQxir3EXqgv0lrSybAky1Zw/lXVD/ovVALkeZjMwuBi7/m/VqXfwRFV0f/WYRE5lDEyuF0279q1jwvg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from AS8PR08MB7095.eurprd08.prod.outlook.com (2603:10a6:20b:402::11) by DBBPR08MB5961.eurprd08.prod.outlook.com (2603:10a6:10:203::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.34; Tue, 25 Apr 2023 12:46:32 +0000 Received: from AS8PR08MB7095.eurprd08.prod.outlook.com ([fe80::b630:c4eb:fba3:1158]) by AS8PR08MB7095.eurprd08.prod.outlook.com ([fe80::b630:c4eb:fba3:1158%6]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 12:46:32 +0000 From: Alexander Ivanov To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, den@virtuozzo.com, stefanha@redhat.com, vsementsov@yandex-team.ru, kwolf@redhat.com, hreitz@redhat.com Subject: [PATCH 4/6] iotests: Refactor tests of parallels images checks (131) Date: Tue, 25 Apr 2023 14:46:17 +0200 Message-Id: <20230425124620.241022-5-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230425124620.241022-1-alexander.ivanov@virtuozzo.com> References: <20230425124620.241022-1-alexander.ivanov@virtuozzo.com> X-ClientProxiedBy: VI1PR07CA0238.eurprd07.prod.outlook.com (2603:10a6:802:58::41) To AS8PR08MB7095.eurprd08.prod.outlook.com (2603:10a6:20b:402::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR08MB7095:EE_|DBBPR08MB5961:EE_ X-MS-Office365-Filtering-Correlation-Id: 2dd9e40e-d2e5-4dcf-632d-08db458b18f2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4gvXj/cvtshnw0c7axP/zqmsW0mY0wxcJ5R+UOah+1BHlc17HKy6NI5OieceudSpIGuOuP9d7Cm15MEmRvET7U2c8LTDSjGmN4nRWLL0oCFpYo3IjvanJw60rW4eIv1dFdpXXPR7pJCF6vCnIH0Lbe9Q2bUdjqRNgBrQlEdYwmP7cg9lxbACzHX1KoKyPmURcS9znAus/OtJPsgk9ndBzRjjSMyKKR8DkTWqBskz1r9RL0X5UDaF4B88bb3EXnM25MdW9plCgCwj6pe8FA0ViJhChQSTEB7q/LblozVs+C+B+/vR+jBkgC4EvKWodigEw9/QsHK9XRyLYW1EqTpBKkz74wV5Iy8lpzgkXJVS/rULWCy9se7hbuSdNUZ8R6j6oOPza8pytIVjl6BCPFr+3RHlhnKJo+jOhnlvRzG5rKD3Bupl2SxJbpNm4dhGEm6KvLl9m+rJDrtNNaeazMzCA5OvHj2lpzewIn+1zqd45lmX54dQ+kQgVSwYI8B2+OE6s5DKxCZ8+BDvevuEYj5zYfuEhRnpuN52wQyJMz/iy/xAvjKJVdQzjpPah4WKtUKuQC71KpXEde6Ubpb3rrAYn98knqGmnYMisuSvaIMbw6FiT9RHbG1fBVzpRk2sZol3 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR08MB7095.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(346002)(136003)(376002)(39850400004)(366004)(396003)(451199021)(83380400001)(478600001)(52116002)(6486002)(6666004)(2616005)(6512007)(1076003)(26005)(6506007)(186003)(5660300002)(44832011)(36756003)(38350700002)(38100700002)(66946007)(66556008)(4326008)(6916009)(66476007)(41300700001)(86362001)(2906002)(8936002)(316002)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: t6EyIjWAvkBtiDaUcf727Z1fcfb1XeK8+MxgAJTT82oBdvMPtL7Mo3DNS5Tk0vIQ6ekPuAb40QBadYNK9fDqd2nexEbnx/o7DqYgVvDDZvMCzCCQy9cQ/RCg/sv/6FiuhcnXYBBOJGtP+UflU297uFZHm5HHz2WAbVsuNjEH7av/m8e4X0EBfBqmbOD5pTkbxoRr4AY3LOp4QttqTQ0QAGheKGMGi5N5ZSjuNk0d4q+CVACVGkRMPEGNLXV7H1HOcKGafiokYCz0TnMsApXUSbfwZ6V1lSO1xGACQh8UJls9L+6q3C4fHrhWJQK+6Zj7phvm5azCzXtFpPnGlo1McH59aYLGoBwAsR0xbRCllobBe0pv8GCGFbfQ33EpOXdfDbNG8WydT7yeXW+Qnczv2fjLfUNowCQg/LV8GXFG0euacWNobxu+wGDgEi3S6Y8MdJq1pcfqi0avn+wmGGeNwtlA8rRnDTfous9UGc7pW6vCKHqe9m8egedBY8QSeAD+GmUs2XgEHRyoh8tc7TTraNyRblLzlk1JHbQR3h1uMFjn9qm90E699gccBlEeP3C8KEbbkpq2j6J1dLqwokJP2ayZvbXSMZhlZf1amP8ihMOkUX9IXR9JrG07Ce+i1ofA4Mt6pPYklXhOHq5yjbWR8JHThO9gHgSOVgkRD2gkeB7oJbG44+97xb/zG5oH4OP83EhGaH/eFawzA68NYyOfWfgG5362VpaLIjckl7oqYS2Co4D4Cl/hY98ILdmoq+lzO7GwCgtkYR74Bux+qHN2I0PMU0bjJpEyZrxaO/7kIDSHrYAvddN1utoLL9T/W8St09c7f40uA5SYlnnypOutfw/lSimcd4u3FN/7o2dn4vHEbFkosZGlYo7fLwbD2E7Q+esNpE8sKzDin5rh/gaxIO3wSJanFfnTWRzka1K0BUTSBh4CfneEP4AAPGxx4T9lTjkVa8ZCB08ySKoaDU5MKxT1BzQ0eC1dW435xXrt57fo+VJig10a4lM6I5rxjJBQKQoLl7Oj88fWLa3FCYuyqJilnsRRlHhpp/faFWhQdWUsoFaGSbcDjCfBgkIFLcBGPGxLxPCVgrVrB0e0y39zG4kIYrt5XfooeD0bCRMEQZxOVkvBJ4o3VD3sTlzavcH21MODCaTLy9Wt7lksGnz7y4f2QCXU0xbgIzUt/mqNqhBf0O2yNb55Es4aTtvF/NeOZsqlIEF8zL3z+AGOJeRp9zYLsjMWBgLlEGZ0KUcLZJEiCe5eQgM/LPX4xgK7xEaBgOXbZ042d5azBeIQc/8q9dA/qc8CBpTzwqAV1n/2h7wi+cUZDW/ZPIDpIAJbKAThifunnP7yvHITJWG9/dO/j2z5ZWnHl+pgmAnRY07VJ0hVUaO3/uiUXdmVJFpzswPCtKc7qMww4SLLe+iZjQy013ppjWbVV90g7ElIPFYRY517rKuy9zwsE0EV0Eunn7dcATfmClseLMWIKlpvSSkZGoI5fRXKRK9LvIzrtZLeoX/om9ux9mMiQ8LTDga5EDMAu2nLInmd20Q42lWSbN5SHqNW/vvLhRs52rNtbV3XBnYjygc8le9g50rOOfyklCk2xcnO/inZdCOm3qo+zE6rSA== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2dd9e40e-d2e5-4dcf-632d-08db458b18f2 X-MS-Exchange-CrossTenant-AuthSource: AS8PR08MB7095.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 12:46:32.5754 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VPJqCihcbZ5Q1qPUcXiM+mn5XNHt789xu9B8IrBuOL+2/FJ84NMaBcO3yybr833OBpPETJLA+gwYhwHMkp8vPlFiYvCy7FtCWXZaOy0T2sw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB5961 Received-SPF: pass client-ip=2a01:111:f400:fe1f::722; envelope-from=alexander.ivanov@virtuozzo.com; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Replace hardcoded numbers by variables. Signed-off-by: Alexander Ivanov --- tests/qemu-iotests/131 | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/tests/qemu-iotests/131 b/tests/qemu-iotests/131 index a847692b4c..601546c84c 100755 --- a/tests/qemu-iotests/131 +++ b/tests/qemu-iotests/131 @@ -44,31 +44,34 @@ _supported_os Linux inuse_offset=$((0x2c)) size=$((64 * 1024 * 1024)) -CLUSTER_SIZE=64k +CLUSTER_SIZE=$((64 * 1024)) IMGFMT=parallels _make_test_img $size +CLUSTER_HALF_SIZE=$((CLUSTER_SIZE / 2)) +CLUSTER_DBL_SIZE=$((CLUSTER_SIZE * 2)) + echo == read empty image == -{ $QEMU_IO -c "read -P 0 32k 64k" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir +{ $QEMU_IO -c "read -P 0 $CLUSTER_HALF_SIZE $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir echo == write more than 1 block in a row == -{ $QEMU_IO -c "write -P 0x11 32k 128k" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir +{ $QEMU_IO -c "write -P 0x11 $CLUSTER_HALF_SIZE $CLUSTER_DBL_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir echo == read less than block == -{ $QEMU_IO -c "read -P 0x11 32k 32k" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir +{ $QEMU_IO -c "read -P 0x11 $CLUSTER_HALF_SIZE $CLUSTER_HALF_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir echo == read exactly 1 block == -{ $QEMU_IO -c "read -P 0x11 64k 64k" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir +{ $QEMU_IO -c "read -P 0x11 $CLUSTER_SIZE $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir echo == read more than 1 block == -{ $QEMU_IO -c "read -P 0x11 32k 128k" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir +{ $QEMU_IO -c "read -P 0x11 $CLUSTER_HALF_SIZE $CLUSTER_DBL_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir echo == check that there is no trash after written == -{ $QEMU_IO -c "read -P 0 160k 32k" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir +{ $QEMU_IO -c "read -P 0 $((CLUSTER_HALF_SIZE + CLUSTER_DBL_SIZE)) $CLUSTER_HALF_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir echo == check that there is no trash before written == -{ $QEMU_IO -c "read -P 0 0 32k" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir +{ $QEMU_IO -c "read -P 0 0 $CLUSTER_HALF_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir echo "== Corrupt image ==" poke_file "$TEST_IMG" "$inuse_offset" "\x59\x6e\x6f\x74" -{ $QEMU_IO -c "read -P 0x11 64k 64k" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir +{ $QEMU_IO -c "read -P 0x11 $CLUSTER_SIZE $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir _check_test_img _check_test_img -r all -{ $QEMU_IO -c "read -P 0x11 64k 64k" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir +{ $QEMU_IO -c "read -P 0x11 $CLUSTER_SIZE $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir echo "== allocate with backing ==" # Verify that allocating clusters works fine even when there is a backing image. @@ -83,7 +86,7 @@ TEST_IMG="$TEST_IMG.base" _make_test_img $size # Write some data to the base image (which would trigger an assertion failure if # interpreted as a QEMUIOVector) -$QEMU_IO -c 'write -P 42 0 64k' "$TEST_IMG.base" | _filter_qemu_io +$QEMU_IO -c "write -P 42 0 $CLUSTER_SIZE" "$TEST_IMG.base" | _filter_qemu_io # Parallels does not seem to support storing a backing filename in the image # itself, so we need to build our backing chain on the command line @@ -99,8 +102,8 @@ QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \ QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \ $QEMU_IO --image-opts "$imgopts" \ -c 'read -P 1 0 64' \ - -c "read -P 42 64 $((64 * 1024 - 64))" \ - -c "read -P 0 64k $((size - 64 * 1024))" \ + -c "read -P 42 64 $((CLUSTER_SIZE - 64))" \ + -c "read -P 0 $CLUSTER_SIZE $((size - CLUSTER_SIZE))" \ | _filter_qemu_io # success, all done From patchwork Tue Apr 25 12:46:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Ivanov X-Patchwork-Id: 1773403 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=UY6CWMjm; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q5MGl2WMBz23v4 for ; Tue, 25 Apr 2023 22:47:43 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prI4A-00014Y-SN; Tue, 25 Apr 2023 08:46:42 -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 1prI49-00013h-KZ; Tue, 25 Apr 2023 08:46:41 -0400 Received: from mail-ve1eur01on0722.outbound.protection.outlook.com ([2a01:111:f400:fe1f::722] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prI47-0000dl-1S; Tue, 25 Apr 2023 08:46:41 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OJk6Qby7/4x596IhNC79H7aQt9aj6QcP5R/CE3Ba90kV4YDtewf0y212k9xdDIcOGKEwjMRNXWatp4I/Watb8vpAW/rMihuYevQ735zPGS1Ue12iHi0nKVP69Jh3xoP3tWgvABwgWiGnlY6ezGHnNSFcLkFcDSuOHyqq7QANaNcW/tMhU7W1wnd9IVtiut3pnAB+hf4HZ44WcJ1nAhEiYI8V4Dg5jWICNvm7B6CrVPtQjO3E/6HRLiIpqIXU8QTE2MqsZRqleKN5OUyIIc5bMy4Ba66pCDmiOglzvTUGJMwMMPtOrshQhykB9Mkpa1+A//2ipqmsy1EZz8OEOb8Taw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iHjWyJBVJLjBk8GJoTBSaW47iRQj6eUjDQdb19JXS3Y=; b=MIT5k56Q9II59xL6u25kh1onUEtcQDNAx3SHKv8NDyyebYH/9EcKS7ZSX7U0Tef4uIXzFLYlYkRF4gXmasa8++3IuUYGnsRhu5EPSUnFczYYcpWOYX1kjwMCDaz7gkHs0OBnHYsX+Ip6TYCrP7jf4WOhsOEs+5g84kfxYjvXk8CwA1sPrbehRLYlRfPDtKCx59g+ZhZ5AdFaj3CK5EFFKYW602U6UuOaibRS3179+UudgTfNNraMgNVidb3qRaVNAhJywycW90RMW4FLMEwsjsp+q2B1djmXfTYPybCb+7xSTOF6tBpUefvnXQQ53hBgxmUjnZlDQgYkNEzuMOk08A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iHjWyJBVJLjBk8GJoTBSaW47iRQj6eUjDQdb19JXS3Y=; b=UY6CWMjmfecQSbabmuIi1S40zliwWxmOYnoX0Shz4CWYTgQhAOs+eEbAr6zm6trzKEwZHGUEQwtU4Ixc3CFyocygFmyQ8Q/XhzGWng/yaLF13ClrGzXdCb3P/1A7tpdzAorJq7MWH9QN/Ti9XoB3f7lpJttvSPbRUqwYBxkH34L8Mno25edzOoL8iHvU4vgoCtPTXmXuUV9WbyaZAQBsO6kW4+Rtsouqjsqr4lFb18kLun6ejkCNyhJoMHDqQuEB8DmrBGzjUS4r5rIWDSb49bfHkR53POMZtkx3Xf5VMCsOJTA7uSAwD/gf0jH0vI8MWfrZZPQKCSHSzJfaf4U9Hw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from AS8PR08MB7095.eurprd08.prod.outlook.com (2603:10a6:20b:402::11) by DBBPR08MB5961.eurprd08.prod.outlook.com (2603:10a6:10:203::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.34; Tue, 25 Apr 2023 12:46:34 +0000 Received: from AS8PR08MB7095.eurprd08.prod.outlook.com ([fe80::b630:c4eb:fba3:1158]) by AS8PR08MB7095.eurprd08.prod.outlook.com ([fe80::b630:c4eb:fba3:1158%6]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 12:46:34 +0000 From: Alexander Ivanov To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, den@virtuozzo.com, stefanha@redhat.com, vsementsov@yandex-team.ru, kwolf@redhat.com, hreitz@redhat.com Subject: [PATCH 5/6] iotests: Fix cluster size in parallels images tests (131) Date: Tue, 25 Apr 2023 14:46:18 +0200 Message-Id: <20230425124620.241022-6-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230425124620.241022-1-alexander.ivanov@virtuozzo.com> References: <20230425124620.241022-1-alexander.ivanov@virtuozzo.com> X-ClientProxiedBy: VI1PR07CA0238.eurprd07.prod.outlook.com (2603:10a6:802:58::41) To AS8PR08MB7095.eurprd08.prod.outlook.com (2603:10a6:20b:402::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR08MB7095:EE_|DBBPR08MB5961:EE_ X-MS-Office365-Filtering-Correlation-Id: 3bfebc45-7edf-4a52-4f32-08db458b19cb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zylpkcJJmgMP3W+RMC5oCYMVyn+M7jPVBslqDUNRmvOnnEd9sKeK/ndzyHFwKRGdDXsAy36zyTgF5VugvQZEBigXQ+YdnmG1eDNoQEoi822cAfxPrp5c1MMfitb1p8Gmj9r/QsEmrfUO7Bj5F+XDD7MLDt6if2G8a1cX3wcrICAp6Ua7rFH1eOkO//xfjrRYFcU8makAeBkfwRtkC7IeJtWmMBPxLAb87Wadd2yPwJykXfhRgZhUZ8Y5i+l6VMNtzpWV9yQLLC+EPxIT+ks79fbAAeIUW8k6X5duSOn/BtYDbB7StMCUKkSGLQ5jz+/SQYwrWVZxZT9tjiiAm/AZuwq5Xd1+HwZ0ZCI85Md1PJEgn7GSAYw39LDYzXLbb5lYYi2jAShwlk3J2EEk4x91h3tje2Hsu3USiVacChOIaLR1AEfMtHxaQRLJ13STBvSyNZjTG8bjjiMxU1NqBNvBvscs2+r8DBGxGDid3u8ETqmxpVIeKwc0O0ZnE1kD1JhuHboc7OpXEmPamZkcDXHuBltNX0kv6IV4qDS5WT251Cqzy8l9CAuhTago21acfLdMD8kyBl8xkN+CNt+ViqPDbe4faR+vMzxi6X5BxOZpcpUc10RrzLIqe6f1fmNcC3HsGahwv73xECz3AhPu/8lXxQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR08MB7095.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(346002)(136003)(376002)(39850400004)(366004)(396003)(451199021)(83380400001)(478600001)(52116002)(6486002)(6666004)(2616005)(6512007)(1076003)(26005)(6506007)(186003)(5660300002)(44832011)(36756003)(38350700002)(38100700002)(66946007)(66556008)(4326008)(6916009)(66476007)(41300700001)(86362001)(2906002)(8936002)(316002)(8676002)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Np2iFqpYgJSubnOBFFlYRu28dwZffm9wUbOpOBhCwXQGDTsnPBN0FVhwpBhUnAaEOBVwdkf2p8H84MG9g+M3f5bWg6O9nzbMARSz4oRVGIvwquUPA2mDOLIRBJZ6N8ojgFJJ5LZME3hIqdHHzjRySVK+4u/3qgOV/D9ZQlQMxG/Rh0MFH0ABAkRWB3VO2QK4Q3f3DcxudGgjV1N7o9hiRaX6fzoqgy3dIIfu7HqLPyQcq3F/+iKrxBMwxEmovPs/5ntxRr/WDNaF2AAqkY5aBSpn21hXCo6ytWDOQctK2FGlWTwm1udI2d50DWr+auWFnUcWxkjWZZXRX8fX7g6/kC3qadNqWZNj8LkFvJhp5Nj1flm0rlJavNCKshDwAcUbLv2Tcwarb8t3NsmkOuHX3a31MeNbvlzA3WuN/kwh4oPFztZ+WedAoMNqgOhnYGU87HuYEIhMPSkGrBdq4ZfMjfqBxbo7m+mp6IOyZvkYUFZe/VxhRzbpKzHUQxqZt2O4Fb2/88iXXB2AxFepMLbL1W4Xt6y0njYl6Cmg5MVVlY+TcZwsJD71k0QxQFmL57MLVv8/dASmWdyhIiHcKMuAyOyB7/5K/Jd/UmD+LwQ+n9CEFbofSAMSSs9tXGRvKZRshR0W9anqjiLBKOcRh+vScoa8pCD5PBX/OHY+948Zu2jocR6ZGm/xpFlhPMsl6c5dWmjp0qBQeq4c51N1auVYD5swAoFab7GZC7hIxgvXJGmYLKrAJEiJcZEh1SAnRJ3DLZwx+g0Q9l5TQfKk66YnDIUZTVO5g/UH6lGu749jaGTP6nq2K+4m9cfavLgSCKNFWCn3ebc4VRzJ7kDSwZwFWR+anfKWA+gRmJ4TcuUYX6J/S9HQLih0UmSZO6nKFv/vnLiYP5PgCrmWS6f1JQ/iQbnAYbE7+PruGHJ3nqvKSBTYIjr/wlfObGQesAbaFhrfS+T/1G23WkPZPWOu0c1VG8kcjYWpmSIzAq1fVn5WlV6yTJChg5415kndBKjflxzevMSlB1SQrS0qmFuA/r0ycixHN+G0Y7Sz1God1M13gK/3k/XdNOnHrs+DviLKMJnNMof85EroZUkboToJRYl1rkJBv84VJW0F3/NgSwtiFfUTSybHUawDWgiLZ+PdIXHAEPCsOU1fxX6M9q2iXLMnaN+zF15vcuUrW4TQ1o5UMUjTTMtwJ9bcjGrIobRE/mTlcuC7n34X/tqv893i10KPw+5KN8SnC6aeSbqaNzQ1uCYMTFdstIVcKQ95RiHM0n1oa7bj586twVGgOMSPKhPQ5Xv1GnWyAAE4/wiYb9VOgPjfLsK44/9sbm8yPmsOL+xgrog/r0vERweOdOB1t7s/swO3HyM+xKAHsbBJ85BDCkNoJv+rNinsS0j3N0lz9d6QL65kJSb+LbGfDhmZpmx/jhUjFHfA4qj2UlNP4PcpAPaaQEF7LLqImvlGGKXR/lE7I8hGraW13D53UyBQk6ekEDWvNpItNpJNA4a/bovDCj1Jv15Ijc9XYwtvIxtwjvAxBK3rHLPcaFZhe/cIz/CDlcNCHdHlYhbln2pMJ5oV6zBSM8WOMO+y8v1GPZ7rWNRUHYErR5Lzna0GipfLLNypFA== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3bfebc45-7edf-4a52-4f32-08db458b19cb X-MS-Exchange-CrossTenant-AuthSource: AS8PR08MB7095.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 12:46:34.1072 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: A7hcmFxnCUCrsIe8eUtwq7LvHoJfxjnz9BLERhkBU4erGK3NCyyeqS+islkB+xRFAHATGQIH8QcUKh2VPEbNmDtLNKqn5aOR+OAgx8ISZss= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB5961 Received-SPF: pass client-ip=2a01:111:f400:fe1f::722; envelope-from=alexander.ivanov@virtuozzo.com; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org In this test cluster size is 64k, but modern tools generate images with cluster size 1M. Calculate cluster size using track field from image header. Signed-off-by: Alexander Ivanov --- tests/qemu-iotests/131 | 5 ++++- tests/qemu-iotests/131.out | 44 +++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/tests/qemu-iotests/131 b/tests/qemu-iotests/131 index 601546c84c..78ef238c64 100755 --- a/tests/qemu-iotests/131 +++ b/tests/qemu-iotests/131 @@ -44,10 +44,13 @@ _supported_os Linux inuse_offset=$((0x2c)) size=$((64 * 1024 * 1024)) -CLUSTER_SIZE=$((64 * 1024)) IMGFMT=parallels _make_test_img $size +# get cluster size in sectros from "tracks" header field +CLUSTER_SIZE_OFFSET=28 +CLUSTER_SIZE=$(peek_file_le $TEST_IMG $CLUSTER_SIZE_OFFSET 4) +CLUSTER_SIZE=$((CLUSTER_SIZE * 512)) CLUSTER_HALF_SIZE=$((CLUSTER_SIZE / 2)) CLUSTER_DBL_SIZE=$((CLUSTER_SIZE * 2)) diff --git a/tests/qemu-iotests/131.out b/tests/qemu-iotests/131.out index de5ef7a8f5..98017a067e 100644 --- a/tests/qemu-iotests/131.out +++ b/tests/qemu-iotests/131.out @@ -1,26 +1,26 @@ QA output created by 131 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 == read empty image == -read 65536/65536 bytes at offset 32768 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 1048576/1048576 bytes at offset 524288 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) == write more than 1 block in a row == -wrote 131072/131072 bytes at offset 32768 -128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 2097152/2097152 bytes at offset 524288 +2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) == read less than block == -read 32768/32768 bytes at offset 32768 -32 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 524288/524288 bytes at offset 524288 +512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) == read exactly 1 block == -read 65536/65536 bytes at offset 65536 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 1048576/1048576 bytes at offset 1048576 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) == read more than 1 block == -read 131072/131072 bytes at offset 32768 -128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 2097152/2097152 bytes at offset 524288 +2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) == check that there is no trash after written == -read 32768/32768 bytes at offset 163840 -32 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 524288/524288 bytes at offset 2621440 +512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) == check that there is no trash before written == -read 32768/32768 bytes at offset 0 -32 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 524288/524288 bytes at offset 0 +512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) == Corrupt image == qemu-io: can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write ERROR image was not closed correctly @@ -35,19 +35,19 @@ The following inconsistencies were found and repaired: Double checking the fixed image now... No errors were found on the image. -read 65536/65536 bytes at offset 65536 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 1048576/1048576 bytes at offset 1048576 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) == allocate with backing == Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864 -wrote 65536/65536 bytes at offset 0 -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 1048576/1048576 bytes at offset 0 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 64/64 bytes at offset 0 64 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) read 64/64 bytes at offset 0 64 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -read 65472/65472 bytes at offset 64 -63.938 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -read 67043328/67043328 bytes at offset 65536 -63.938 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 1048512/1048512 bytes at offset 64 +1023.938 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 66060288/66060288 bytes at offset 1048576 +63 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) *** done From patchwork Tue Apr 25 12:46:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Ivanov X-Patchwork-Id: 1773405 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=BPgL+SCj; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q5MGl06mHz23s0 for ; Tue, 25 Apr 2023 22:47:43 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prI4L-000172-RL; Tue, 25 Apr 2023 08:46:53 -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 1prI4F-00015Z-MW; Tue, 25 Apr 2023 08:46:47 -0400 Received: from mail-ve1eur01on0722.outbound.protection.outlook.com ([2a01:111:f400:fe1f::722] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prI4C-0000dl-Mp; Tue, 25 Apr 2023 08:46:46 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QDx1JzLVxUU4L5v1DWpnvc7PjCSA5HD/FJB+w0qv05cYMAGyDW9CsLaKCYBecMl8G4gbXheCLL69c4KCxuBM6EvbkDnYMkzujNzKNvQ4vBRYXKr3qFjChUSUMGEQG1QPtzTDKkTNk9+v10jGhZdsFCW399hhn/G4dB1BLWum8eOxMXVyvhfOXsHdPn1oB4iqvfh8peXP4HmBQSgsxXCis0/M2F+Kr0qK/l8ULWulcMTLswnosKdPiDjwbifwMaylzqksh67gLsZxMV0V+Idb5XvI9cw5oAXEZsnG4HIGe9EwLCVsAk3zTfYlTIOUqwG6rh8k5m80xZP5jyUEg/vKeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LGL7HxMgStalF0Xb+Gap4NMDYI2rDOLd7JEiC6WJGlI=; b=mNEB1LAvFqxrXh2h9rY+kfBleBDOS922TZa1A4Wh+vdf2/hTrucmz1zVzeXXRzrxaqsPitsaSb4DL5uKgqVkZRScYhqxLwr+8oUTpm+7k19HWuxkSMZuUWHVE1KQcyQdaEQOq/yIstj46A9mpLfDqB7V0PZcVI6Tw7LfRsGZWL3rQGqMFsDYL96XSMejgqS09Bkp7QiCe9EvwXrAMPdZwe7/QYpGvsuxZc0/ZSU+yg5k/Fjz2Poqas1PpIQ8olRbjV53bdhn2hfv9AVqbmOHjqgDgKP7Bj/15r+kFWkxtF8ex8kjnHRbAmvfSe6qGtqepS4gzMUh49GBjYeITTVcLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LGL7HxMgStalF0Xb+Gap4NMDYI2rDOLd7JEiC6WJGlI=; b=BPgL+SCjx/Yv1zPiXOkKzNXBuWBLs2brmrLt7SSPSpyC0j9ABQzVSpZGedaxFFvgSFDcmsS3uxvKbc23WCxXMLs5cG5pA/tsWMsdWTg7eCJP21HsDQZYX+M7NUSJ2LiYmgfAaa+dMahQo5ZSZ/7W5aTkbMy69D1MuxEy1LBmZm+RH/zYkO8H+zLAF77FxJ10nbxsXxPDzKfjjyVHAaD90/gGHYR04sCAKB+eqcTAeY0sxoiz2NqzGNZiDFFU0cfH+77hdpaajaV7O83YbE9sSuYxFQVLtweC9wf8EfECZjYeLwxf5M0/K1I/EePbUf9tza15/cI2Ax6ysNEqfTGh3Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from AS8PR08MB7095.eurprd08.prod.outlook.com (2603:10a6:20b:402::11) by DBBPR08MB5961.eurprd08.prod.outlook.com (2603:10a6:10:203::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.34; Tue, 25 Apr 2023 12:46:36 +0000 Received: from AS8PR08MB7095.eurprd08.prod.outlook.com ([fe80::b630:c4eb:fba3:1158]) by AS8PR08MB7095.eurprd08.prod.outlook.com ([fe80::b630:c4eb:fba3:1158%6]) with mapi id 15.20.6319.034; Tue, 25 Apr 2023 12:46:36 +0000 From: Alexander Ivanov To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, den@virtuozzo.com, stefanha@redhat.com, vsementsov@yandex-team.ru, kwolf@redhat.com, hreitz@redhat.com Subject: [PATCH 6/6] iotests/parallels: Fix test 131 after repair was added to parallels_open() Date: Tue, 25 Apr 2023 14:46:20 +0200 Message-Id: <20230425124620.241022-8-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230425124620.241022-1-alexander.ivanov@virtuozzo.com> References: <20230425124620.241022-1-alexander.ivanov@virtuozzo.com> X-ClientProxiedBy: VI1PR07CA0238.eurprd07.prod.outlook.com (2603:10a6:802:58::41) To AS8PR08MB7095.eurprd08.prod.outlook.com (2603:10a6:20b:402::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR08MB7095:EE_|DBBPR08MB5961:EE_ X-MS-Office365-Filtering-Correlation-Id: 9a2e8841-e9c5-456f-b5ed-08db458b1b48 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v7yaG7CJ5zF7E/8F8fxL4MQpD1axwwU2SN8UtyAaV5BAiGa0ZeLFcZPc9gJeXDEfomNyVuNd6/FCd97seQ7gmsSqY4O9erAJPLMv+OgjiH0UjrnootzfSd0uLXDABT7p2vZqTpxIzdXVEt8YT16bV/R7mmdRdG4K1pFeHXMw1oZUKBheC2gpuQYuixYJ34AE2Tki3/u8w7x+5yQkaOtNy/vS+1oihv6/IE/+GXz0jqRWoptTdAUOdG8wPgQL/9Hk6rpTIqeHlLdqRD2JyYHLzOmtBHmqoFO7mU7UGntzbx+LX9ma/1di7mCYltA7x+Wjz9UFP94Z3keKQSIe80TATa8FnvggQvbL5owcbLU1+8eJvQmAdTdHZvtiCmTGA1zOEtxSHGHuGzCeLzTtemOfa8x+wR1dCCPjgdpkTalnzCpCghMRiDONiuaB19dc5sSQ0oKmiH8+gDWHPEF2xBHPDUtmCKWzq+TDUsDa5ZE3Oyg1k20kFTVvtvAasRXUC8Gl2cE8c6xP1z51e7IyESDT0+NM874Fu4QmzWhI3hanSFIpFSGoHJVnuA8IljDR5ajxcwr0MNei/k3kpxyPWQg+mdKj9kSb351IKlx+tCBzbhuSkmBZhGzZCsPL7mAQYMaaSUcugNcHvE7wGnIirfqnPQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR08MB7095.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(346002)(136003)(376002)(39850400004)(366004)(396003)(451199021)(83380400001)(478600001)(52116002)(6486002)(6666004)(2616005)(6512007)(1076003)(26005)(6506007)(186003)(5660300002)(44832011)(36756003)(38350700002)(38100700002)(66946007)(66556008)(4326008)(6916009)(66476007)(41300700001)(86362001)(2906002)(8936002)(316002)(8676002)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4mMiGt+UzBFdilW249ZAiEj5/5OW//6K34BiAEpEM+CCwDh8X7fELHtCzoQ5u6gVU52lhAV+rs/wIW4u2CSWc6EvNw3WfDIJPaf9ezXSmmedtdr67t+pHvsZwJMd/dIwnlk4xxI/j6alUo8UAPcR2Zaoe2VesKRBMKsLdPnlaDzouC+T7F0NimxtVTqREiDb39cU5mEmafBtgjPG2lUetAVUxhWNiySq/qGxbfCW1mzE1eovkS0CElLAqdgFygO/57FgizVwKAyvNpS4O1UtNyp+omij+rbdOjBt/8A+DW+BZ8ijkSUV1cVx4039OYx/QRxq1i0Mf014CwDNyq1uM49B8fDz1zeylIrUEvdUNKASTLMkpTpXixgMHhZme6vde7J82b0MXWOF15e8XbiUWksdGSCxSOV1S+dDJTXcAP48Ib1/byBleU0imoBFmtkclrON61AhYUBaLpAC02ssg1DpSSZaLVwqguyNwN8peNeC4HQ7PHgNprsZbdnWMgQwPqOoKMucAM+I5hPkxHyqx5qz76CWo6lXXDszXbYqnl2WsWqARyUydQitMiz5AcruBwPo9yJkTPR7WAFenoSdQrCKxAJHS7X0Yk1Ihun7NL89nG+TCbG6ekc+SEtfnwhstPambqF5FgsxD+LkDeE8o5tqCrLJMVYnE4oMzc3HGw0SHjd0WxRAkZ0uQL7e5LgMn4mfuF5jzxYC2VANq6LPwxNrecoR22X2vPZEdfiS7OD223oGurPSF1+sXBpni7qRzMb0zwxOM/NNOxTRVglr9nsGbrQICqkSoT0rCHYgv6lzoPvvtjS8oDAmm/5tVy7inmlzyfv/YNOHj9yLK/3ljpWSYA8uZKxpPBstGhjTEFlrdyl20HF+6qXz2b1RwfdOYV3t7iXl5iy3BKFxEx3sM7wFydm2WncJpiJJzN9nntVxIEw28HBU4KG2jNZsqcGUDd9UQWSRgDmT43v63/DSSgKZlUmaFyKn+qLSHgH6lj+Q2P39L+S7O+VkRLuzcsbCqO4aD0B4KyDDP0HWYu6w7Gt4rna+0zRFYcWhiwNjlQhaMxmW7p/0WSW9ZK3pXTA5WwvT7GNQu48HMX7KKGHburf+Bl2N/MCPCjDCb4JE/677+na8H+OQg9Hrenn9BohVIaFC6iscgbtPxwQvPIgTm8I+HKUFtOYSQhF3QQtgH2XY1ebqRCYDbnigXMA0jiIn8wFxQPo49CdZmoQsS22BCS9FbyJYi4ZY0VqH7DL89OaEO//syuyCAaKGbnzcnYyVZ9SYfcrRQtC5JeJqNgEz7M/zksQlxrDvTTnuT1rPXmYsnW6wSxtuE7qX0ksSfVJnYXCwQqe0JQ+LKLooldP7zFYglXJH0HlBQaQanmpKYwGutuf0FQoMtkSfsA5ksTE6WalYsyeNOaAUK/UdEmIN2ZUYPi9yx1Zb+xvu4LzGEDxQMMhrM8o+0MHw0JJjpDx24Fnly4dawWDxEocLy6wKKcsoV/jtjy9bmWpAgM0dbzK5xIiU6El0i4DOqcblJO1Vsd/QBmKrIL4XPt5HGohHZLfn+K5FlawHdzTegSBXN4drtrFq0S9/et5oTxgAnCdqRhiOYHCwSG6bH/UBMLAFIg== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a2e8841-e9c5-456f-b5ed-08db458b1b48 X-MS-Exchange-CrossTenant-AuthSource: AS8PR08MB7095.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 12:46:36.4980 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bm44tN9cCe/7FrvNoot0ok7b3b9NrFVWd7gl59d14xg6hDD4M0xfIVzjW3DTdDg7muD9DOGDlsHNRXr+errVSKWBnG3Mh6wxjYvqU0LnusY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB5961 Received-SPF: pass client-ip=2a01:111:f400:fe1f::722; envelope-from=alexander.ivanov@virtuozzo.com; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Images repairing in parallels_open() was added, thus parallels tests fail. Access to an image leads to repairing the image. Further image check don't detect any corruption. Remove reads after image creation in test 131. Signed-off-by: Alexander Ivanov --- tests/qemu-iotests/131 | 6 ++---- tests/qemu-iotests/131.out | 15 ++------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/tests/qemu-iotests/131 b/tests/qemu-iotests/131 index 78ef238c64..57fe1e5577 100755 --- a/tests/qemu-iotests/131 +++ b/tests/qemu-iotests/131 @@ -69,11 +69,9 @@ echo == check that there is no trash after written == echo == check that there is no trash before written == { $QEMU_IO -c "read -P 0 0 $CLUSTER_HALF_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir -echo "== Corrupt image ==" +echo "== corrupt image ==" poke_file "$TEST_IMG" "$inuse_offset" "\x59\x6e\x6f\x74" -{ $QEMU_IO -c "read -P 0x11 $CLUSTER_SIZE $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir -_check_test_img -_check_test_img -r all +echo "== read corrupted image with repairing ==" { $QEMU_IO -c "read -P 0x11 $CLUSTER_SIZE $CLUSTER_SIZE" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir echo "== allocate with backing ==" diff --git a/tests/qemu-iotests/131.out b/tests/qemu-iotests/131.out index 98017a067e..d2904578df 100644 --- a/tests/qemu-iotests/131.out +++ b/tests/qemu-iotests/131.out @@ -21,20 +21,9 @@ read 524288/524288 bytes at offset 2621440 == check that there is no trash before written == read 524288/524288 bytes at offset 0 512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -== Corrupt image == -qemu-io: can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write -ERROR image was not closed correctly - -1 errors were found on the image. -Data may be corrupted, or further writes to the image may corrupt it. +== corrupt image == +== read corrupted image with repairing == Repairing image was not closed correctly -The following inconsistencies were found and repaired: - - 0 leaked clusters - 1 corruptions - -Double checking the fixed image now... -No errors were found on the image. read 1048576/1048576 bytes at offset 1048576 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) == allocate with backing ==