From nobody Thu Apr 25 01:48:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631615547; cv=pass; d=zohomail.com; s=zohoarc; b=Hoq2Hecaz354aecGUn3BU39pe/EKyI272gOXbYmbeUt8bWU4cHJZqPW1ZcbQUmWYPnWWJKjzmF2Rb/AQo+51Szf+wDzTvCZHlAvl3O72vcg+U7Wmp1CYO3X6I5RgjS1jO3PxozkIKLSYeD0aje3XleiOIzGriELN3lL5+AZzOKA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631615547; h=Content-Type: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:References:Sender:Subject:To; bh=Ti2Mw+9/ZEbCgAbQVCQKsCO/HGMNA7lDgtXys/NpHpY=; b=j5fvYCjX1NwtAF5Cpju2udrP9MTvXUYf2PlvsI+m167JQwUa6hAip9tW5f9jg910/2X9ZCfIhjNj1gfA9gQYuUTfZWwWccQUyQLH6vooS5eNYRScEtiN2GAWlm/tWxHP1Hd7bTS9nmGqb6dif7JbpTawoyVG+LtZEyAwl/cUrnA= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631615547254856.0190670850207; Tue, 14 Sep 2021 03:32:27 -0700 (PDT) Received: from localhost ([::1]:35580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5jl-0007SN-UL for importer@patchew.org; Tue, 14 Sep 2021 06:32:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5do-0004Ct-Uh; Tue, 14 Sep 2021 06:26:17 -0400 Received: from mail-eopbgr70123.outbound.protection.outlook.com ([40.107.7.123]:7651 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 1mQ5dn-0003M0-4w; Tue, 14 Sep 2021 06:26:16 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1716.eurprd08.prod.outlook.com (2603:10a6:203:39::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Tue, 14 Sep 2021 10:26:08 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:07 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TKtXeOE8wVTwQHUI7lA80j59QnveXjVh0CNiNwYpEd0x4qn5qekZzjXI2eOmLb8PnHKtN1tqyBRepEEIN0sPrSKNjpj0RFP53ebzQ6UgaDAIqFtBsnYcIY+rVRrU9ccUziuTYAE29Vg4do1K/lo+P37AaB5Z8wtKKmI75FeXzmWWJ1KnX9sFina+RnuTIUP1YLFIzKMVQon52eKQcERL88oSHE+KsmomCbjhHmahi5d1u5b49IFBi0ElQpU58Z44khr8EvzyIhztKEVsA2djspN1ujrJd5LhwzcfIWlTDI1RKMl2tzG13Gdb8cSWVpJREckPLSlxD+EhZ9i9vr/Ijg== 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; bh=Ti2Mw+9/ZEbCgAbQVCQKsCO/HGMNA7lDgtXys/NpHpY=; b=a+z+HPwYXitcVjlYRX/heQKlPYGXD/j7/zVKneLv+ZEXgHdmOGicfcLfuNlsdRgZBf68xw8kWwqzzoEMFQpQOKP6zox84FOrQ9SiXTKgHK7HVZ6yCZnNQ0ugZBSVmfBuaBZ41Tan/ybv9h3YMBLE1H2wEeUm+AaGWCFGlW3rHUqEp7b/ayx7lGw/ZXaPyL+9qgFEI04qbsBYoFfUNulpwcAYsxV5QgwRNs6T014dWuG5jajqfQPTDFbfHORYmThlvf5piad4hvQiDtUoJUTr8O3w7WdrO4P3GQeMtdEnDHNjbg/Vz6CElMVU4a+LFMlmbn8gBMZ2GpOEdm5ToQA2Iw== 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=Ti2Mw+9/ZEbCgAbQVCQKsCO/HGMNA7lDgtXys/NpHpY=; b=rTykT/MpHz9S0uwWH08xLcT/389pJn7ycaVyX4VGXDO7k7LNtjdT3Gxmki5TnGhRKfWziL546Wga8byUt7+DFFHzHyc+pLOvzGGu57szyti268QAHjMXNirxSwieBXaOxqTKagmwJX9Pu8/+5jEB+nYK/3OSf0cWVFjrigWwcAk= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, Max Reitz Subject: [PATCH v3 01/17] iotests.py: img_info_log(): rename imgopts argument Date: Tue, 14 Sep 2021 13:25:31 +0300 Message-Id: <20210914102547.83963-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 12cc875c-44eb-4e49-1259-08d9776a1086 X-MS-TrafficTypeDiagnostic: AM5PR0801MB1716: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:400; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 51RBIBHW8BlELo1gWPQtz3voqa409/tvAVxQ6x8gSvf1AUcKVBMwQ6ZOjzjq1aM90/mXd0o3lePkCkajuLKi3XqLcR/cApFN/duccDX4l0K+1QecjgRC17udEXVTt+lBPg6wwbq2bmkqyZeKl23eVQZ28bcALujGSwhb1X1sSgw5Ungb/wP/85CR3rsrFJOJzi4WM3KeBcNHwBFM9HPyTsBvB7E07CycEuAZeLOq6CbOwUXHWeQTpH4X0Ya4LJsVrDwyoZiew0L0YysqDf7+PADtowqXNvdJ8AZxfTNEyKxJz7iknXwiswp6wvlbejvh08Z2H9pTy+TYa2jX1WmyqRdMOO2Bt/2ecc+f9gkRbLDabDJbIM3QscTfHGoI7ungSoopkx5GrTOCTFeZyHZMMg5I38E6u4RfNVYwM3nah34yAwFyN35H+W3DrJKbWOBVpe8JRWn+ARlkWNKLZFbJ5KGQO6ZR+Kdt8nxzZsSYsT56P0We+Ciss/tZM1MhuebIxsQ6aHrynm2wSqW3lPcbSwHbczPQDF1g4GdWxptQMcLFfyB1kBY+y8K0KzCDL2MOz8HymJ5MVgszpO9HjG7yi5ly/WHrMqcNfCIhMFBJEWlM6fD3xTg9eFFwebsUYSPW+9NQutOQYB2IzNyRkfed5EAtQyqXa0UrEtKneqgkMaknYQCEkYcFkdQO/czQBeXeozA6QOInpFNa033LtGmvtA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(396003)(346002)(376002)(39850400004)(136003)(478600001)(66946007)(66476007)(66556008)(36756003)(6512007)(52116002)(186003)(4326008)(6916009)(5660300002)(2906002)(83380400001)(86362001)(2616005)(8676002)(38100700002)(38350700002)(956004)(6666004)(26005)(316002)(6486002)(8936002)(6506007)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gIxkOje7RhNBhjsHzodSjHOUSIX1LiLsydor0eW2s7gzWHVFnzQa8v67iCRa?= =?us-ascii?Q?OXFly8hW+sRcW+jqn+hYOEgi+DL1BlJuz6j0MLQ2MU00AK5BEKdY3EIacUn7?= =?us-ascii?Q?aOCiwwiW+samlJa0E4hRQiwnMgAA9tgGiQlLzv37lbOpeKTliiNsK1/apX2s?= =?us-ascii?Q?e+u3u0jHfJU21myGPcqiAuo88KlTs9oHD05yQYivJEWTESaQxmN6E2CkQf5A?= =?us-ascii?Q?6bXAL4OlWc+Un/0u0+FlaK8NHosGnm+iya2EnN0ZWl77G6wVM3EGGFuE+0qN?= =?us-ascii?Q?4GS8DblSspkCPJ/v/U4y7GXDL4Uo+UiUfXq9fiIWX82JUCRFLuCFPWFXuLTg?= =?us-ascii?Q?uIS3MlNYQ4gd60zMvES54jib5h4gH5oIumCLbW1m6vc6HWzO4qtqvM+LFcGL?= =?us-ascii?Q?GviF+Br/nEhxidVn96qa/gpJuaUeoX8GOgqDUiqxOxUa6ULgNTPuFwMBNWDs?= =?us-ascii?Q?hWXyJLX3362g66OsvJ7Pha7t5WnbHCTIbID5xy97b/LcQtrA6m+wmFszdX39?= =?us-ascii?Q?cvGeyUWdCUwj3w/hsJQGTJa9UyHJOVnmKh9OtO23REkqBrE+RVc2mKgkU3nm?= =?us-ascii?Q?2eB4bC621OnFj0+z63ECyqQSBqsbKgzAxub7tRCvrmZZ+FnfHzOj7IXEnAwP?= =?us-ascii?Q?zrQvwqn2NSBOHER80NmsWTYB9FTR5gpiMmpuqRLXtWhZyv0GH73bVdwJhctx?= =?us-ascii?Q?uIdf40qn5cYsqJ6GhMlJCyzoFmKjsNnzMTVwW1Bn2dlqzoTHEeRuoVEJT7V1?= =?us-ascii?Q?d9uj2YuNd8NF8U6A7brAY1s4C1NfhxvrtLnEdn3EdMp+8hxmres+UiTc86Ku?= =?us-ascii?Q?EPq/N7d1IJunMAwGJWWN/hnRIgh/qGXrNrrlWzHmJ8KIm7pzDip7UUqSuWg5?= =?us-ascii?Q?6LymAj9/IKz4ayM1gU8jxjXRuBnRXsUZpaXrSuhtDnbuzxLesLu3Oc6n9FTO?= =?us-ascii?Q?6cxI3AvoNDV6ESnHOQmPHW8p62jReCttD6j43e7L+TBn1dFzzXCfDph5HM2O?= =?us-ascii?Q?VXVfs5UXoYV/f80Vd4FMZKFdQkIQ4Qi1O92mGiyDzS0XqogBOGefLJIa1vuD?= =?us-ascii?Q?N/QE9Sbwza0tZafFXUA4acmtS9rcH4EQcpL4cXHE7vjAS9XU/GWj7KMiGYBH?= =?us-ascii?Q?fWyTMBs/h/fzcVekNCCdBtY0U3eK6k9CkROoxGyFxVu+JYatBIi5by8MtzDO?= =?us-ascii?Q?oC5uHL4soZxT49oAIZ1hbulJYkadppBR+/mjGSZD7fkYeZqsb4+YAjbxx9xz?= =?us-ascii?Q?/01XEe9j5qFqrzxMA+RQ3m6eLeWxflzCBZst48Mbs26EuO/0tm2NfAzEysQI?= =?us-ascii?Q?J/fx69ALx/1CFYprAy660pTj?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 12cc875c-44eb-4e49-1259-08d9776a1086 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:07.8878 (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: XYJBHtWrEtwAgAH+vgbN+jyeA9Yn1z0ElJgicmzL0ViElTbPO7nR3Uol9kExfrRKQmTLREUju2IGBN8sBGV9itBU8vm7fMOGWgLFUBypQbc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1716 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.7.123; envelope-from=vsementsov@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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631615548483100001 Content-Type: text/plain; charset="utf-8" We are going to support IMGOPTS environment variable like in bash tests. Corresponding global variable in iotests.py should be called imgopts. So to not interfere with function argument, rename it in advance. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/210 | 8 ++++---- tests/qemu-iotests/iotests.py | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/qemu-iotests/210 b/tests/qemu-iotests/210 index 5a62ed4dd1..79b4967225 100755 --- a/tests/qemu-iotests/210 +++ b/tests/qemu-iotests/210 @@ -62,7 +62,7 @@ with iotests.FilePath('t.luks') as disk_path, \ 'driver=3Dluks,file.driver=3Dfile,file.filename=3D%s,key-secret=3D= keysec0' % (disk_path), filter_path=3Ddisk_path, extra_args=3D['--object', 'secret,id=3Dkeysec0,data=3Dfoo'], - imgopts=3DTrue) + use_image_opts=3DTrue) =20 # # Successful image creation (with non-default options) @@ -96,7 +96,7 @@ with iotests.FilePath('t.luks') as disk_path, \ 'driver=3Dluks,file.driver=3Dfile,file.filename=3D%s,key-secret=3D= keysec0' % (disk_path), filter_path=3Ddisk_path, extra_args=3D['--object', 'secret,id=3Dkeysec0,data=3Dfoo'], - imgopts=3DTrue) + use_image_opts=3DTrue) =20 # # Invalid BlockdevRef @@ -132,7 +132,7 @@ with iotests.FilePath('t.luks') as disk_path, \ 'driver=3Dluks,file.driver=3Dfile,file.filename=3D%s,key-secret=3D= keysec0' % (disk_path), filter_path=3Ddisk_path, extra_args=3D['--object', 'secret,id=3Dkeysec0,data=3Dfoo'], - imgopts=3DTrue) + use_image_opts=3DTrue) =20 # # Invalid sizes @@ -176,4 +176,4 @@ with iotests.FilePath('t.luks') as disk_path, \ 'driver=3Dluks,file.driver=3Dfile,file.filename=3D%s,key-secret=3D= keysec0' % (disk_path), filter_path=3Ddisk_path, extra_args=3D['--object', 'secret,id=3Dkeysec0,data=3Dfoo'], - imgopts=3DTrue) + use_image_opts=3DTrue) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 11276f380a..782d4f0e21 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -205,9 +205,10 @@ def qemu_img_log(*args): log(result, filters=3D[filter_testfiles]) return result =20 -def img_info_log(filename, filter_path=3DNone, imgopts=3DFalse, extra_args= =3D()): +def img_info_log(filename, filter_path=3DNone, use_image_opts=3DFalse, + extra_args=3D()): args =3D ['info'] - if imgopts: + if use_image_opts: args.append('--image-opts') else: args +=3D ['-f', imgfmt] --=20 2.29.2 From nobody Thu Apr 25 01:48:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631615477; cv=pass; d=zohomail.com; s=zohoarc; b=O+4nfhBF1DTK8WYQJYF1OvP7eQ5F8kdHwNFlty0fz8ngRXaE9V0mtL3+3kjwYp2pcB7l1TFtgeDbOpuiS15pEAALC3Vu3a9/bbJjxFn49q0sdg+j1I9eFxsczXGSfkeIaocyhCxo4Pd4mAb7E86ynLwdkE0QZ0r3QHNG360fzFQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631615477; h=Content-Type: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:References:Sender:Subject:To; bh=yLnJ9lhBOr4HM/2jKbVZFerN95grt02CoNvIgf6YH0I=; b=SUdCWRAEAKL8vpzxu/mIhxYDA05LpQxO4DN9dio0REHjhM8zc0IV64NgvyrDJYtxY+WWyhz08dV9GvjmHEva9F6UA4aituzmBjPbqBj2wfRUPqjardzzN+I1VtP7n6W+dmiVTkNytTMYmFzO4ItNaa4ZQue2IUz4A5UfUcwzLEA= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631615477161337.6002542800819; Tue, 14 Sep 2021 03:31:17 -0700 (PDT) Received: from localhost ([::1]:58588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5ie-0003to-2u for importer@patchew.org; Tue, 14 Sep 2021 06:31:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5dr-0004Lm-LQ; Tue, 14 Sep 2021 06:26:19 -0400 Received: from mail-eopbgr70123.outbound.protection.outlook.com ([40.107.7.123]:7651 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 1mQ5dp-0003M0-Lb; Tue, 14 Sep 2021 06:26:19 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1716.eurprd08.prod.outlook.com (2603:10a6:203:39::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Tue, 14 Sep 2021 10:26:09 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:09 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZhT91DY3h0TSnZr1MqDQkdbx7R+ydW4Pc5MEadHFZ1Jio40VKQDHMwHsrZByiuEo7rKsW9jPSXkJNTkMr3fswwoPIxa1G1sI/jtkD5mP+iBdAE87RPPZxZnEJIqMVNbEZV0ISR9fLfAVUgotbFCMfb8yPV7wxcnAaZHkz4JrKWbHP/vtWJnGJkCt1X3MRvG3mX76zLUlK55aIhe+mFMxs+qzL4UE/qZo0pUu83P6yZT5yLXtNg9Q82Tifso77lMD/dwpBzG8mXyZaglAzs7UUbvfT2ywYuOnUiTL8M8cfwCIvvdt/yWTThde3ck9BT++o6KaFA8VsYdoKUWIrut3pg== 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; bh=yLnJ9lhBOr4HM/2jKbVZFerN95grt02CoNvIgf6YH0I=; b=ULgDGiYY0AUpueSsn3Ag9OfepKqtHedrgZ2bBOz3k06HcLeT5CoVwQHo7zzaQJ/qBcYuUxHXPloVRFqxThSSW2PW4AlExKi64bGGwk+yrM1vPP22uOH+7OI4+sFAZ4BJugB9eOO8EpZwSvwSJg/ILzgplEcSPF0TLSZb/pZWQ+8ZIA6G7OV5H/x4UBmuqmSmBCtGyLrbUERMNEM0y3K8TCdrWaq9ru2hNP3lPeno4rliQujg85jCFMETtmuvdT1rVtF2r0PXCKnNetujOL1HbXhIfP/CXomtOFM6yfdNDFIYPcZ6PoY+tLTkPoUtXd5yyxLX5fcevzh9PlbowUIIHg== 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=yLnJ9lhBOr4HM/2jKbVZFerN95grt02CoNvIgf6YH0I=; b=dHB1z6vxo27wbxnCuSUJFvQc6mrn5vjA9ZTbKK7HYA1kWFMQcWfXWwQ/G/QjBLOngmMUpWyr+L77GgllgeDvrzIJRGY+X28IoW4TrWKtKMyJZb0v7dYatKABPo9q92ahISjl8Vzu/VeP/Ca/TQXIZlhqVkZ7J3OmSqWJt2IS2XY= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com Subject: [PATCH v3 02/17] iotests.py: qemu_img*("create"): support IMGOPTS='compression_type=zstd' Date: Tue, 14 Sep 2021 13:25:32 +0300 Message-Id: <20210914102547.83963-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0ed61147-f5e0-4763-76ac-08d9776a112f X-MS-TrafficTypeDiagnostic: AM5PR0801MB1716: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /kpZ9Wyp8PNr51CTs8l/8+V4udlbToThWN75t2d8JenuOtehC/5DQvjz3Et2AUawzP23wVRgz+1ZkgK7yl7iVakoDpFDuGtu24hiWhHIERXAHcqcs4k3u3d+TN/4zo3MaGHBMydiZp4i0W3/jehM/N0Obg4dwXf6TI5JQQ063B80Flr9CbPLpi1K6o1doBPK0xE+sjB7Hj9DUneUPoIfQStFWtssSjkghXvFLEQZyFs/pnm9CTm/UjZtAsi6+g3Fq1Hk8HVxi0jZlChMGaMyGvyvEbVJQ2/joiRPYGh6F/X378XV/G2LiI5NEy9hiSYO9W8Zo7NOzGLIgYUB0f/Jptcgund9/yLoYAoSVSYjuVnBawE9iQ1hM+bclc3r7sGrpXCy+82GVpUzF2ngD8DqEL4tNjV82opP+gL8T8ZdXtzNIeRN6PHKpdxV5BRd5rjLSD2fcdpM5zAFOwqbW7j9xD6q64DlhgFlkYE24/vK38T42mafqpgnqgZ45cV6ab/gGYKPFifvKMpiotnGpUT2zkQYzj5u3+qnv24SG0IhGdDtoH2FK+DfBCT7G1RVFDuZHZ3iq7KxO2uyUenxYVydz4dsNjokEz0HO8XgxTnXs44eYeZ4mmO+MC9t/8FmuqjNsTyLJxwIacpujK9Ts7JWRKLYclwS6UCoez5ktgbsQDXUtZ9C1kqSSWp3/T4FkWPpwXC+TKx3ZswaOeS8CDd3kUrz3aKdgUZ2NLUyjHHOAWNCFGjiTpKwmrMddNYhLmRHHgaj06z1yN1OkoCl97zfKTWHAnZ2EHnliC4gqT3q2NU= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(396003)(346002)(376002)(39850400004)(136003)(478600001)(66946007)(66476007)(66556008)(36756003)(6512007)(52116002)(186003)(4326008)(6916009)(5660300002)(2906002)(83380400001)(86362001)(2616005)(8676002)(38100700002)(38350700002)(956004)(6666004)(26005)(316002)(6486002)(8936002)(6506007)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UjA/PFjz8PuHP3o7+mE7SMloY+0cHmpZiczLFNTPG0jsDRJ0W+A+S7j+rEkh?= =?us-ascii?Q?AyYFLUuL29yQ3fxSy1GQuzifoFYbW81xbw8J+2xpI4AFaF4w9Ts+fcAbFlKY?= =?us-ascii?Q?0gcoWvcmvdB/dITqtEmcioXXIPG82zd0mxkNNL86xlT5AQ+28dkdH4YFn4OQ?= =?us-ascii?Q?E8HF2CK5yTer5RLwqNhD8BcdYoliuzWMpLbyD9d9UsI2ydEJg2kHlWjihk7/?= =?us-ascii?Q?plmpelizUpchhiOt90IdDmwr516Y3A2vZ3UPLo0JnKNJ8Dh1YNvprg6y+/NL?= =?us-ascii?Q?tOOGXdvVpSQpJ2ViZdxwhqT3cUh/6nrQXcBohJ7NZjZCIEUHhiFsR8QGE1FR?= =?us-ascii?Q?Y357u1h2+khZiaQOBcuhnPQrnnlzy5SMkPWiztxCW3OtXzAhnjs1DrePPuAN?= =?us-ascii?Q?K3b2H4BqZex1szi1QYM6lzxFmx3/mP7ZEeeV0mBdCPlVthFOMiA2NQ4hD2Xe?= =?us-ascii?Q?tWGiJMA0Xe84ac8MR9rzYq49Z05rW84UuxSylscV6f8cgkuoLaTLR8ntz5vK?= =?us-ascii?Q?YEo7uaX4Bmg6HmS5ZWu0Leaq3zZ2lA7Tw5gifoIGwuYT6rj8yWQLNHULAvHi?= =?us-ascii?Q?2sSO3m3lajJu8nPeNx2BCaXZlkVLl3sbstQCOYEuCokx9RNzPJq12ZFURzS2?= =?us-ascii?Q?Xi1woyLE5ViNdIxrYIE8/TA+JQ2r+0IhfJMVfQiNGhuWwgvK6dwSPkvkEnuP?= =?us-ascii?Q?PWLa1OgCprayqAks+d5vEKkCTaST/BsGiYDFrhXO/OfaL3OnuEdyWaUbvgCo?= =?us-ascii?Q?T4BU8ypTATonDkeEe7UmbGJWwZJB63dw6ZDbfp67/smmV1rMmczp2RrCdudZ?= =?us-ascii?Q?x/D4jXEv+3mlCjc+N7Pf1Blu4/+WNmyWCKYjKPOGLU2XArH0bswv0Djj4/9q?= =?us-ascii?Q?phG968pxyJN9m5CTogTiXE/EjeYUtPwzZtp1TQpY2176bCAQ5HM8uL8+Hy32?= =?us-ascii?Q?wztb+FwVhfJfNyH/LlUc/V4CvTeiieKV/rO/yJahiuNHM/UNSBq2tXWdl8zX?= =?us-ascii?Q?zfh2A54tdXOa9SSccAznVYLBDgyYDdwOtZWlKCX2ukWwcXgK9dDttZ4lY6wK?= =?us-ascii?Q?oybo801aub1wzElS6SYyHXnwaJozrSggtqZQpyaW2XDWlBVbMLfJ/l4rXYyu?= =?us-ascii?Q?+1m81QCFJvJ995jHXJyMf3G7KfrVMn08SWxT83rKj+Bl8uRnvXgZddb9u2qE?= =?us-ascii?Q?P6/4wyB4B1leo5x1Jb3CqmfTJB+pcbkvAQz2dKmB2cB3sYw9CgANliFwwR1+?= =?us-ascii?Q?7JgaKBGjSNTuIuZPxdjzqyYP/shdDYDI/uGZjTnKBXRqsas3ExxWS0eHqTc3?= =?us-ascii?Q?BeobBw6OeKUpOGWZEPuJe+dp?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ed61147-f5e0-4763-76ac-08d9776a112f X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:08.9422 (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: bWsQokvbtN7nXppW7p0DObrZ6Dzof8qZoGFKEW9EzSipUdH8QJNK3ML4Bok3IfKHP8gO8IVwzgZHa3qebJi05zCyp3oeB5PuVRBwQ2N3OfY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1716 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.7.123; envelope-from=vsementsov@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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631615477926100003 Content-Type: text/plain; charset="utf-8" Adding support of IMGOPTS (like in bash tests) allows user to pass a lot of different options. Still, some may require additional logic. Now we want compression_type option, so add some smart logic around it: ignore compression_type=3Dzstd in IMGOPTS, if test want qcow2 in compatibility mode. As well, ignore compression_type for non-qcow2 formats. Note that we may instead add support only to qemu_img_create(), but that works bad: 1. We'll have to update a lot of tests to use qemu_img_create instead of qemu_img('create'). (still, we may want do it anyway, but no reason to create a dependancy between task of supporting IMGOPTS and updating a lot of tests) 2. Some tests use qemu_img_pipe('create', ..) - even more work on updating 3. Even if we update all tests to go through qemu_img_create, we'll need a way to avoid creating new tests using qemu_img*('create') - add assertions.. That doesn't seem good. So, let's add support of IMGOPTS to most generic qemu_img_pipe_and_status(). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Hanna Reitz --- tests/qemu-iotests/iotests.py | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 782d4f0e21..c878fdebb9 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -16,6 +16,7 @@ # along with this program. If not, see . # =20 +import argparse import atexit import bz2 from collections import OrderedDict @@ -139,11 +140,35 @@ def qemu_tool_pipe_and_status(tool: str, args: Sequen= ce[str], {-subp.returncode}: {cmd}\n') return (output, subp.returncode) =20 +def qemu_img_create_prepare_args(args: List[str]) -> List[str]: + if not args or args[0] !=3D 'create': + return list(args) + args =3D args[1:] + + p =3D argparse.ArgumentParser(allow_abbrev=3DFalse) + p.add_argument('-f') + parsed, remaining =3D p.parse_known_args(args) + + result =3D ['create'] + if parsed.f is not None: + result +=3D ['-f', parsed.f] + + # IMGOPTS most probably contain options specific for the selected form= at, + # like extended_l2 or compression_type for qcow2. Test may want to cre= ate + # additional images in other formats that doesn't support these option= s. + # So, use IMGOPTS only for images created in imgfmt format. + if parsed.f =3D=3D imgfmt and 'IMGOPTS' in os.environ: + result +=3D ['-o', os.environ['IMGOPTS']] + + result +=3D remaining + + return result + def qemu_img_pipe_and_status(*args: str) -> Tuple[str, int]: """ Run qemu-img and return both its output and its exit code """ - full_args =3D qemu_img_args + list(args) + full_args =3D qemu_img_args + qemu_img_create_prepare_args(list(args)) return qemu_tool_pipe_and_status('qemu-img', full_args) =20 def qemu_img(*args: str) -> int: --=20 2.29.2 From nobody Thu Apr 25 01:48:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631615597; cv=pass; d=zohomail.com; s=zohoarc; b=keB6XtORcZB9m7uoP1zUxlwv3eBdayGf5wRoHSTsSQhlXXacnJ3In+cMhuzr48t4+lidQuuqK7qZMnSxCTxHE/6K3dBgy9wj801T9yyBn39pc3BI33Ngwu8mqcoq/HhjdQ3yLzG1gZitS+LEnUhaPDfaeOQmz237X1Ju4KXCp/A= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631615597; h=Content-Type: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:References:Sender:Subject:To; bh=w5aFtROQLbfCktByTa3PSujnpNmJ38tZs2mRSHTHX10=; b=jbsVxQR3WvduRRvFbmYFrLpJvukLyvO+1MlVKg/uqDujAtG8vtThKmDvFHt+nxttGkjQ6SJ6du+2w7Uye2Iw83Boac8phJl0YKq5cLnPNMsOleOpnn35/h4LNBjjwTPfzewrUT2CYzRfl8fWMlPhm7YoPvJn3Ym9LU+pXnry1Og= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631615597938613.9440550036023; Tue, 14 Sep 2021 03:33:17 -0700 (PDT) Received: from localhost ([::1]:39128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5ka-0001OW-OA for importer@patchew.org; Tue, 14 Sep 2021 06:33:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5dw-0004dR-Gk; Tue, 14 Sep 2021 06:26:24 -0400 Received: from mail-eopbgr150095.outbound.protection.outlook.com ([40.107.15.95]:35540 helo=EUR01-DB5-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 1mQ5dt-0003UE-Sg; Tue, 14 Sep 2021 06:26:24 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1716.eurprd08.prod.outlook.com (2603:10a6:203:39::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Tue, 14 Sep 2021 10:26:10 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:10 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EuU48sFvETB0hNlmIA4eyeoLV7YoE3W1JYHG1MGf5nIOxNwDc+5y155TziFTFpjtbNkqEJXfbWd4vR8CnOOlw4nBLwm2YXn8KTWHoYrpRCzrNyJctWfpSFHPTlf+J2pS5tG0RoMMbwpfzfB5j1JgV/bPuwwLS05APNLrOhTw1V00Nhx3enBh0/fuN6y44b+c+x1hGAPnJYZMlcCzCuFzaqI0CQ0XJQfmE0o+yDSi38yH6CVjndHBtKsLwBV2jR20zjGrU1cKQBkRh/zWs0mAuEKcD5LgaidHeDyjI3Dih8+lo7v66rc4rva9IllsnEJo9HRcTXv7F54CWhuJ1qVHGA== 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; bh=w5aFtROQLbfCktByTa3PSujnpNmJ38tZs2mRSHTHX10=; b=lHQ3Pb8M6IQ29fUTwr7RKN3YEJchD85i089uYYvn2dpEkkd+aTf7ts/zQ7p5PW+EwoFiTdc4s8+3eTdsw35oug/Jdg2sNLj7PFKeBLsjZYoBu8KHmBydAFpc6rH6yTtDHhROTRLWJi1VuPJarUl73dAbMmToHhvIE+fjVkjUbAxkr54ocQBxE69xzS99D7AEgFvIiC9rpuQCHHNNNw4PvkBe9D4B+V0WczfmF2a0SOvi08h2ourml+dzEnkJljvF5EJEdn9lASfoM0mu2FDKtVh1Nf6LasYrm5EuF+8pIIzV3JGYpAk73pgD52/TcMF2oVuXdJJw5dI/t81AsBOEjg== 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=w5aFtROQLbfCktByTa3PSujnpNmJ38tZs2mRSHTHX10=; b=a6WNRcdZVd9zN87KrGLrdIPbR0jm8bnRvAnAEm/Y3B6+cMUSnAjEsv+OomvFGbL6bm+5JY8QhB2u3/Gj7jRSx269Or1L8ym+t31NpBR8pVn2P4eOpenPb7Hf1afamjt69EQWTC3LW8wOZEIW2JHM2u3RikMH4JIqa6/zUbggzuU= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com Subject: [PATCH v3 03/17] iotests: drop qemu_img_verbose() helper Date: Tue, 14 Sep 2021 13:25:33 +0300 Message-Id: <20210914102547.83963-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 42c2fa13-84df-4798-6f48-08d9776a11c3 X-MS-TrafficTypeDiagnostic: AM5PR0801MB1716: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1923; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9JamOBjw05+dFPEx1aKDopSf1+v4tMVv2Mjgktm/Nvw457whGOgMY7CxJOOHHMi6KS3Nt+9GcME1NVjnIWsYBhXsBb062OI8cn9QLK/SvA9qiaKkaQiys0F3MeIqX6WqRUhAf6mrlTxwCAUwSR32Hz0oYe78b6hvShOHm6/aJCMG52FWmZKXb4HvisYC0gxcuwLi1Jg2z9kBKdIN4zmUlqz9XNiKUy5pGjMOLkGcFSP5d/u9RCN/lQcxmGgN0U1OSFE/VGWbLDGvk4/0A5SW2KW3mmYTJiN0BjksEu0INiGvmcsjcMIqWiPQhnPXE/dvD0uRYjn9e/wgFLb3IrVIonyJiyqtYZ/lZVvyg8hgIWCKLSFuYgj9YqoHyVsdHj7tMRg9AghCFxAu9Q4H9SH+IlWuBgCK+tuUpMr54T394j+M6Szci7ksIudTo09sxMelY9ypP3PKhXvBTko6qoFnG0eun7zx/QmiYpnHjtNJc1Lg2SM4P1W5iharupO046FObMer15KqdoC3Ki2EZDw4cWiZzIeQi3bZ3jr5J4BjYcsFIKwjZ7PsdJYuiZMXlzosTQT091zhuq/Ao2nmT+dlDZoyfKCbYyt0ap1VbqzC9jCvoemfiSzbj6Emur3s27JK7P0KNnq59ChticRf66rLQnj37BfnihZZTxHSdsg3E3m9bDbpBsINt8/MPxBzW/h6SccpQHF5FAP26lpSoedX7A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(396003)(346002)(376002)(39850400004)(136003)(478600001)(66946007)(66476007)(66556008)(36756003)(6512007)(52116002)(186003)(4326008)(6916009)(5660300002)(2906002)(83380400001)(86362001)(2616005)(8676002)(38100700002)(38350700002)(956004)(6666004)(26005)(316002)(6486002)(8936002)(6506007)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ubQiAn/XLCp47FC/2My8fHPskJbdPc2bB6+g1xVtfE4sZI50icewTFZrbUeI?= =?us-ascii?Q?82ZPoKpKiSHGCyKV7wi5KbRVRKRWSYm8xSIGyZS3bpCxu+nZmL3WAPb9nUCO?= =?us-ascii?Q?uPa6jgBV+5f2wcrxsweZ7fm6O8b3nVqk4rMpY99v/f140NbBdL+/Bs0Pav+G?= =?us-ascii?Q?dzee1Eublvh+PUW3QKrucTqDA1khYTaDtA5IKvib0eq8OcLYNMODxbvaFYn4?= =?us-ascii?Q?DP7TS1APJcjxoJzOVAU49ZeBJOs85VuDWeybn892jKv5nteIGyoGFUUhcU39?= =?us-ascii?Q?CD2v4uGHKxpyqCMjonkHNko73pEoSlD6aGwPuRwVJkL23u3IcNmmAVEaSJE0?= =?us-ascii?Q?IIDq9P8aJ55lU0Kw4Odedi3uwgprfd5BdYepNQRXqLH/FUxMeMAvtg2s3igJ?= =?us-ascii?Q?g89WZ4pMToM5o3OIRt+BzLO+Nqb6BmFwfvfo+f2SLuFPrCD7zvPXjarlmQtH?= =?us-ascii?Q?P+oLr9BhiQ8dkIiWaY9oRRfyycJhdKMm0pWPUfxxQc5nQVzrpzmr30AAcrfM?= =?us-ascii?Q?EUYnau6DktWtetL3NpW15SD9SHEI+wGKCjJBBC8p3LizVpuxjPeHfyV9X9H+?= =?us-ascii?Q?xwZ72Hv4pPbvZ1WfKKN+rrdoLq6LD4k8K0+K6cDCmMR23u4A4iYoADyUXzEs?= =?us-ascii?Q?FRAx9HhJCkY7qcp7r9X36UEDoHNMniun0FYyVY3K0Y5Vpf23x8sLB6SNUeTA?= =?us-ascii?Q?NuUpTafORGkla9jNDAvcsKI+H63XdYUjSyTerLZPVpU46hpFp74CJ/ohZfQ6?= =?us-ascii?Q?jhuI32bjqYzGPurpTO+xJPIUqwn87MCla6A1WktXDp/T9yEGuSP+4/ypmOtL?= =?us-ascii?Q?fzeYF7/Cqx+XKHmcatSU3rs+lzPaV/EhnGluSFJIkNaarbHUWygzZL9yDVs1?= =?us-ascii?Q?dMUWAWxH1f+CAO0e3XJ2IOO190tCB55RtQqIkwLcfXx+pucx1nwasWLLMLis?= =?us-ascii?Q?5j5568WRgU2pfE8AnjUF16XllrWa1fT4E0Xp+1GZAxNT3xuHvF2Tf4aQL5zh?= =?us-ascii?Q?PH314Z0Gr0+rHfLsG6WWxayaKgCIcl0aOcwo/uDEMVa4FyBJnoLg7Xry35Bz?= =?us-ascii?Q?bhzf4exVQNeOzJDy9BhTkVDlBL7F5HVnbbWLHTh8gLLuMmOAAKoa8hfSf0Wv?= =?us-ascii?Q?MD1woG36hn29IsvmXZ3xaxNMpwYlOFlSy26UlsTBwaSAbeR8gtVOxxDdyJ6F?= =?us-ascii?Q?Z3LcSzYzvI4t5R3u4EqT/TsTJW/XQIinaGs6nnV2Q2Zp2myyn2cgT8h/umvY?= =?us-ascii?Q?MMWG2P5a6VKXd82NlRdxnyX3dYy/i4jwVPvvVkaFkR3Bn7ULcAc0TvWez56y?= =?us-ascii?Q?c8/PwQvm4ylsSWYAt/NOZRdI?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42c2fa13-84df-4798-6f48-08d9776a11c3 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:09.9050 (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: qu7nXOiFIzB3AmXy4Qe71/SGDI87ecp7j6hsnGpLDf1YmXmU8H39xv/A+YNwvauWwv8Z+04BBffTnCf29NHnA8xMDzGr+JJZBwOt5VtIY1k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1716 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.15.95; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631615600175100001 Content-Type: text/plain; charset="utf-8" qemu_img_verbose() has a drawback of not going through generic qemu_img_pipe_and_status(). qemu_img_verbose() is not very popular, so update the only two users to qemu_img_log() and drop qemu_img_verbose() at all. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Hanna Reitz --- tests/qemu-iotests/044 | 5 +++-- tests/qemu-iotests/044.out | 1 + tests/qemu-iotests/209 | 7 ++++--- tests/qemu-iotests/209.out | 2 ++ tests/qemu-iotests/iotests.py | 8 -------- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/qemu-iotests/044 b/tests/qemu-iotests/044 index 64b18eb7c8..714329eb16 100755 --- a/tests/qemu-iotests/044 +++ b/tests/qemu-iotests/044 @@ -24,7 +24,7 @@ import os import qcow2 from qcow2 import QcowHeader import iotests -from iotests import qemu_img, qemu_img_verbose, qemu_io +from iotests import qemu_img, qemu_img_log, qemu_io import struct import subprocess import sys @@ -112,9 +112,10 @@ class TestRefcountTableGrowth(iotests.QMPTestCase): =20 def test_grow_refcount_table(self): qemu_io('-c', 'write 3800M 1M', test_img) - qemu_img_verbose('check' , test_img) + qemu_img_log('check' , test_img) pass =20 if __name__ =3D=3D '__main__': + iotests.activate_logging() iotests.main(supported_fmts=3D['qcow2'], supported_protocols=3D['file']) diff --git a/tests/qemu-iotests/044.out b/tests/qemu-iotests/044.out index 703cf3dee1..ff663b17d7 100644 --- a/tests/qemu-iotests/044.out +++ b/tests/qemu-iotests/044.out @@ -1,6 +1,7 @@ No errors were found on the image. 7292415/33554432 =3D 21.73% allocated, 0.00% fragmented, 0.00% compressed = clusters Image end offset: 4296217088 + . ---------------------------------------------------------------------- Ran 1 tests diff --git a/tests/qemu-iotests/209 b/tests/qemu-iotests/209 index ff7efea11b..f6ad08ec42 100755 --- a/tests/qemu-iotests/209 +++ b/tests/qemu-iotests/209 @@ -20,8 +20,8 @@ # =20 import iotests -from iotests import qemu_img_create, qemu_io, qemu_img_verbose, qemu_nbd, \ - file_path +from iotests import qemu_img_create, qemu_io, qemu_img_log, qemu_nbd, \ + file_path, log =20 iotests.script_initialize(supported_fmts=3D['qcow2']) =20 @@ -33,4 +33,5 @@ qemu_img_create('-f', iotests.imgfmt, disk, '1M') qemu_io('-f', iotests.imgfmt, '-c', 'write 0 512K', disk) =20 qemu_nbd('-k', nbd_sock, '-x', 'exp', '-f', iotests.imgfmt, disk) -qemu_img_verbose('map', '-f', 'raw', '--output=3Djson', nbd_uri) +qemu_img_log('map', '-f', 'raw', '--output=3Djson', nbd_uri) +log('done.') # avoid new line at the end of output file diff --git a/tests/qemu-iotests/209.out b/tests/qemu-iotests/209.out index f27be3fa7b..515906ac7a 100644 --- a/tests/qemu-iotests/209.out +++ b/tests/qemu-iotests/209.out @@ -1,2 +1,4 @@ [{ "start": 0, "length": 524288, "depth": 0, "present": true, "zero": fals= e, "data": true, "offset": 0}, { "start": 524288, "length": 524288, "depth": 0, "present": true, "zero": = true, "data": false, "offset": 524288}] + +done. diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index c878fdebb9..fed7e1f640 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -213,14 +213,6 @@ def qemu_img_measure(*args): def qemu_img_check(*args): return json.loads(qemu_img_pipe("check", "--output", "json", *args)) =20 -def qemu_img_verbose(*args): - '''Run qemu-img without suppressing its output and return the exit cod= e''' - exitcode =3D subprocess.call(qemu_img_args + list(args)) - if exitcode < 0: - sys.stderr.write('qemu-img received signal %i: %s\n' - % (-exitcode, ' '.join(qemu_img_args + list(args)= ))) - return exitcode - def qemu_img_pipe(*args: str) -> str: '''Run qemu-img and return its output''' return qemu_img_pipe_and_status(*args)[0] --=20 2.29.2 From nobody Thu Apr 25 01:48:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631615352; cv=pass; d=zohomail.com; s=zohoarc; b=UGnK5/vVsNdClInt0Bmm5gTRyYqc2lEAxKMg7318mSE/rGC2VSXL6BeW84pr8OlDSDAdc53ggJS3yLE2oInn87bB6/Y4XVeFzUJ2s54BVJYHwBuR2u7BM2BEnqKIiGQ16WcGQVaecfgzvCLDvXPsTs/Grg6YK3onIHQP7XJp7wU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631615352; h=Content-Type: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:References:Sender:Subject:To; bh=iEpVDIxKUyicKgoOP7UXW3oP23jidC1MqwU5O2E+uUA=; b=HMMrrgj6xr8HiI7CaDk+6BqoBqE5kGBN2P3ElKidB6yJ1HTrQ2ZTZB0EY8ud2Ch+8MIrEbIvIZcZXC4kx5Fs9o1QW/TJWkEqWGe4Qsam+ydstOyFFCmIDkF5gmomYy9wAewxoCNSd0b/ICe6h4PJgHrKg20+cVUYUHBiQGEnlpE= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631615352379223.84894838469825; Tue, 14 Sep 2021 03:29:12 -0700 (PDT) Received: from localhost ([::1]:55114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5gd-0001Y0-7S for importer@patchew.org; Tue, 14 Sep 2021 06:29:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5do-0004BG-8z; Tue, 14 Sep 2021 06:26:16 -0400 Received: from mail-db8eur05on2115.outbound.protection.outlook.com ([40.107.20.115]:20224 helo=EUR05-DB8-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 1mQ5dl-0003Ok-PY; Tue, 14 Sep 2021 06:26:15 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6071.eurprd08.prod.outlook.com (2603:10a6:20b:29f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Tue, 14 Sep 2021 10:26:11 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:11 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EHoGEcKOX2/QId5dmaOFhnDTfi/B4J2geEpq9NV/JjrTxv3evzoEAA9tpsi2zcMC9xDcLGKr3h6Qm8hyvBFsaAng2YrCcJdKB8teywblU/CZz3znOSDJKNVuBIB+Q+EsS2wkIdY2gzCQ8Udh0gpWfHYMjDXsQpXTPd41FKiCzgQ4snAlOlQioaseS1OMs+Q9EeR6ocG7yM/kJi+TYO5KTR6mrGB2e09+HFbSBaE3H1QqpNb1RFe6temknMeflMfRDSQUMqj+uAJJKLy3WqVQzxERwmCYGyarEiznr4upaZZiyR7ncZYBfzEwY4cGTLvsovQvcYtipwmD1QgRrw7ToA== 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; bh=iEpVDIxKUyicKgoOP7UXW3oP23jidC1MqwU5O2E+uUA=; b=b21u/CzVNxWQy+OqEwSLzQUw+SwGPdsec0LkazMR4nsBJtKQqJXsNR0uC7RSvCJwkV7OeNrCaIFhuqqXxQU4q9IIZrtstJu2LRiTCJjqX3CMM/SWILYCnxh5A5T03VV67kDY3o80JyQkI45kjUpdnM52SmoBPSKfECP8zisenvY1dUdP0sfnqO2NBgUTyenhHOSkfDT6VMOeuoxszY7ChFbBbUcVGcOtWBwku+kn5w8GzjXmo0guxefUjoBExobu9K5t5kKJ4iTVwIVb6HbFyHiZVHsUefD6MTZysgWckXXJwMuhrN6/nYXLBLEpsxe09jETu+Q0sPMTaSlctKlMfQ== 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=iEpVDIxKUyicKgoOP7UXW3oP23jidC1MqwU5O2E+uUA=; b=O4zsyU+k2UaTtjnooMlJON0Zb/DRn+iKDgDqL2tOBhDmI0RMkP6l5YAgo3YS8MNyD2lC2oefEwBFva12wGEpzQvQmY+/YW14Eo8RqnooGlIuqu64Qzg7otldTyZNYfyYo9tMC4k2nP/dzhaHch/jDhVBJ4uZHhl17xzpBxFjBA8= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com Subject: [PATCH v3 04/17] iotests.py: rewrite default luks support in qemu_img Date: Tue, 14 Sep 2021 13:25:34 +0300 Message-Id: <20210914102547.83963-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 50f0e58d-69b4-465f-037c-08d9776a1258 X-MS-TrafficTypeDiagnostic: AS8PR08MB6071: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jQfY4S/27mWQaklZS9dcxSzjPyXR8cd9tazDe2bC1Ly0mhP2hzYSIPEoD56fnzd8eFOvixIY+HxNFR7DRXGLmEXBALYSnteVMfW+MUToWpgeb4o2P0w7a2Kg6Q75id3FXDdoDEJGg1t6KWDHRbSBMiARXk+2AIwOs81T34QpuTQppnqOeI8IyuclfueAT/gt4CYdHKt33JcVHtUXo8pAveM0UqqcplCDNVWl9HlkTioTtWyW5y8xy2hsjz5pgm4QhPDxaOoq2EEWUt1clsDXi0NfQkf52A/ut5zem/J78f93m/pIVCRAEO8Yms5jgREs6PQpgYenX4NMmlzX8UkmOvHRirEmrV1lbFwuMEXUA0rmHQEeKy0js4/P79HZTzjIAxK4XKRZtyhSbQEhlK12Mzzsn0kP6MrStCn1GoPBqp+6SE5hi1dwIpBErYwvBdBmpyOHJTPZi2us0oF2loNo5rr7F8xzpbeOd/7Dw0LvmDqphW6XpKd727b4xWDrOBoimlO1KfgBSfoLF2HwVqnLHmOVC3IEqfOdeeu7zC4YzKVqo5Bxw8sjMkgKnBsu8/gBiAa9aGU505OPhvM/pdZtWxub6+kcIa3JHxqZfw6SQ2OT+vmszFhaIgeZzE3pnUTWBWznfn7K1XstY+BdoS+kgONtPBmQ8Ue4IRqKHXx/xwC2eve07UVKPtEUyOXCfztYP8CcOEaGa7gRGkTQGq9axw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39840400004)(366004)(136003)(396003)(6486002)(26005)(86362001)(2906002)(6666004)(38350700002)(66476007)(38100700002)(66946007)(478600001)(8676002)(36756003)(956004)(66556008)(1076003)(186003)(6506007)(6512007)(6916009)(83380400001)(5660300002)(2616005)(8936002)(4326008)(316002)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?I9I7Uzr+8izIzhJdHzEsOct1gTyY8tHN+oHUdYjYdCCUHfBh6ITXz4UUjkIC?= =?us-ascii?Q?oipZelEBAQl9McnMXnHDPIaVTkWZ2NRsX68iwBLTzlaZZIZCbGVaCqsqTZ55?= =?us-ascii?Q?tztl5jELPx5uoVacaGkmgerO1Tq+cSszYuuWftsVZo2E5pN1xPnwtYvUl1hK?= =?us-ascii?Q?k38rbdLisjLCa//+ub+Z4YqmMazTNi84YlAx3wBiIK6gts4IPW+dsHhm8qcn?= =?us-ascii?Q?IlMTbkpPYwk1O4CjJ6DrE49UmttgBUvCihoTOybQaDNIR5htZurXmO0LFZC5?= =?us-ascii?Q?GHUREJTlcTL85V8CS4p2xZhUaNq4BWjaIMUIfUg+j/wd39d1iyZ3vBjNRwZ/?= =?us-ascii?Q?hTV7m1lxIBHGVLXX9e43ZlQoV12sqA3h1anBkHglwHM6G4iC/6a9fMKOihlE?= =?us-ascii?Q?cqlZS+7lKVWK2d6eUdQalD10FrUmhwiQlEhC+5CTQGp1IR5H5P7bImosYaFA?= =?us-ascii?Q?PNWsWewsZkhSJMDb3UzrBQzrsL1m4eRvjyqhfVs67Gpa2ZpJwDCb9HPmk7od?= =?us-ascii?Q?/sjWNnE/J1jqG2lEE/ijgpbQp9jh8n50Hqr38+AVm/Q5SxpckVCnMP0Tjiuf?= =?us-ascii?Q?koSH/sCXKPMX8F0Z1TmXwx3qXnyAmh1RT7Ubhj3kzTRgkuNQYTKheKJE/HME?= =?us-ascii?Q?W7JHKcnVZVw0D6c9YHZcgu8fYPKI6b39B+Px/stHZpe3zCjjlytGgm+OC0l9?= =?us-ascii?Q?h/g4qWZ3/mNB1sew47iJs0Y6mdwJ8/aoJfhvKNRws5p0QnNtyBBQ+PuGXGqq?= =?us-ascii?Q?RnEKxdt0OnSpx9QiP9ixopQ7I4MWaxZiVcgTp9u8GpCpDsctjpEJrV5mjNM7?= =?us-ascii?Q?7sLZqQtDx5rE7cfQyzxW6HatD1mXelSMQcJPLP9g21rsb/F/ddxr7nKsE6fZ?= =?us-ascii?Q?kEs1AmRFI4zqJOQbxSp+8zqmFyEibq5YYnyxw5LvOMGn/eC+LbgFJGMlVNSI?= =?us-ascii?Q?sFuOqK8JJZNRU3V/QoZBkJrZmDCTDQaxx33w0fDW9+gmZmcaqDdwYUdnR7oV?= =?us-ascii?Q?qfiec1aYFbUfDyghslw5NixY5W5JLsRSv54WCdaC2QK+mYEoEm5pVUh4v4Y+?= =?us-ascii?Q?mwjJCigZ6pdWkx953szcz0IDj4dZ50w0qvHIDKAks0ty3luqIvIcFIU9ptMC?= =?us-ascii?Q?JHNyCRVcNw9NOzwcMf7Bq2NYRdkC2tM8o8NMUE7w9eBlQnDE8tuupW3QOKt9?= =?us-ascii?Q?kw7hOi+Upp9PJnY0KfhMSuI30VtemjDsw2Zk4NGnyetK7EIh3Im5n6dRhrl2?= =?us-ascii?Q?jJPHgCcEe1538l5CGMX08Kd1raxq17PPIeQR4vCkNVMhSGje32mckrL0rexk?= =?us-ascii?Q?fgikdzMffvwYUhRR32Zp7VsY?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50f0e58d-69b4-465f-037c-08d9776a1258 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:10.9016 (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: 0Il4AXqf+ZCHwy371Kz5knfsMpX3W3BhQqTfKB1EdWUL5o+Tc/DUZScbY+1I0NVPB1riYeAdmVX4dXIDZGfqg4mkbZNdvt1uZQD1CKrlmFw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6071 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.20.115; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631615353832100001 Content-Type: text/plain; charset="utf-8" Move the logic to more generic qemu_img_pipe_and_status(). Also behave better when we have several -o options. And reuse argument parser of course. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Hanna Reitz --- tests/qemu-iotests/iotests.py | 36 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index fed7e1f640..a838737c28 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -146,9 +146,13 @@ def qemu_img_create_prepare_args(args: List[str]) -> L= ist[str]: args =3D args[1:] =20 p =3D argparse.ArgumentParser(allow_abbrev=3DFalse) + # -o option may be specified several times + p.add_argument('-o', action=3D'append', default=3D[]) p.add_argument('-f') parsed, remaining =3D p.parse_known_args(args) =20 + opts_list =3D parsed.o + result =3D ['create'] if parsed.f is not None: result +=3D ['-f', parsed.f] @@ -157,8 +161,18 @@ def qemu_img_create_prepare_args(args: List[str]) -> L= ist[str]: # like extended_l2 or compression_type for qcow2. Test may want to cre= ate # additional images in other formats that doesn't support these option= s. # So, use IMGOPTS only for images created in imgfmt format. - if parsed.f =3D=3D imgfmt and 'IMGOPTS' in os.environ: - result +=3D ['-o', os.environ['IMGOPTS']] + imgopts =3D os.environ.get('IMGOPTS') + if imgopts and parsed.f =3D=3D imgfmt: + opts_list.insert(0, imgopts) + + # default luks support + if parsed.f =3D=3D 'luks' and \ + all('key-secret' not in opts for opts in opts_list): + result +=3D ['--object', luks_default_secret_object] + opts_list.append(luks_default_key_secret_opt) + + for opts in opts_list: + result +=3D ['-o', opts] =20 result +=3D remaining =20 @@ -189,23 +203,7 @@ def ordered_qmp(qmsg, conv_keys=3DTrue): return qmsg =20 def qemu_img_create(*args): - args =3D list(args) - - # default luks support - if '-f' in args and args[args.index('-f') + 1] =3D=3D 'luks': - if '-o' in args: - i =3D args.index('-o') - if 'key-secret' not in args[i + 1]: - args[i + 1].append(luks_default_key_secret_opt) - args.insert(i + 2, '--object') - args.insert(i + 3, luks_default_secret_object) - else: - args =3D ['-o', luks_default_key_secret_opt, - '--object', luks_default_secret_object] + args - - args.insert(0, 'create') - - return qemu_img(*args) + return qemu_img('create', *args) =20 def qemu_img_measure(*args): return json.loads(qemu_img_pipe("measure", "--output", "json", *args)) --=20 2.29.2 From nobody Thu Apr 25 01:48:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631615509; cv=pass; d=zohomail.com; s=zohoarc; b=WDvEekWAhGB8JcUR3rvEbBRk9XGvjCmDAuSWTAquKvGEK/OcGn1lg+evTtT7mIh2EyVjCAcYjFdpxdHtu8CuIkB+Y+vJ2YTfaM123c4gTqIJ4zA61CL/DfsB5NRPWL1k2tJvrNy2Pub2sa6V152Smpt0M3+E0p0/Vep2Gd2cJd0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631615509; h=Content-Type: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:References:Sender:Subject:To; bh=Apb2arpVeOqHDJs+z7RI3HGryl/2mDzB8TMmoyJ/ksU=; b=YT12PlpAzob7YrmLbLUAPqzKVZF7MimcpIvy6LQeBQB7fFaKit8ANl0+az/UFdDjCfVbSLdugbbJ6WYgjZ6fkRMwrkxfy6+CODWrOJYRXPlKm64WFvf4Ur6Jkd7megXjgjTd9H3CCULbuLCv7J1+Tus7sfuS1w2GhUKDan3y9EU= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 163161550986958.45715329217012; Tue, 14 Sep 2021 03:31:49 -0700 (PDT) Received: from localhost ([::1]:32900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5jA-0005fx-JJ for importer@patchew.org; Tue, 14 Sep 2021 06:31:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5dq-0004Hy-PU; Tue, 14 Sep 2021 06:26:18 -0400 Received: from mail-db8eur05on2115.outbound.protection.outlook.com ([40.107.20.115]:20224 helo=EUR05-DB8-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 1mQ5do-0003Ok-TD; Tue, 14 Sep 2021 06:26:18 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6071.eurprd08.prod.outlook.com (2603:10a6:20b:29f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Tue, 14 Sep 2021 10:26:12 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:12 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EcZjK9NgAsIDat3ae8C/WCLEvwAo+3dtY8vsiRz5aAjBv68uQFtj/Vz/MzGyMSvLM6pVslVASUzKviypyomhuYfVZFgNV68GwVUOyYefzWdtviifqYs4TrfDEanm19PJ5t/jqYuvsqEMXshInZyObTMc5Z4VvNOyA1k/i5Vcoloc6K3F8zsyI66G/hNs5krtamhNJM2CC1U7Lp2zEvFiRI3XySHCPPNihQf20841AWRQhzKXuFcZoQf4yvL53HntMfIdO2bREYhZubJWACqCkIPoCoLjI1Va8NDXmYYJ0LWKWtOnYw3pN/qp+k4iFRNyOz9h+uPbE2cXJhFv1QZIwA== 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; bh=Apb2arpVeOqHDJs+z7RI3HGryl/2mDzB8TMmoyJ/ksU=; b=fUPag7Rym6/xycQ2KkdJDbWrvXGiBoUj/VJdRa83YSWnJACd9f62DiD7dtQqIIloTsimCk82oKfiNIcuxkhMRB+czDrKNm3hFd8DxzCKUp2KazSzdTRuOI9aeLir6iBF7h32NanlhRRRfC09AgpLygEcYAjYAEGs53eHMYdy5REUnITg5uloAB/GmgUZ5u1nPgygIJaK+BVC1eCZ8dd4qpmvTQV568CUy1m4UwhTJPsvQ7HiyME4DwtZKkxHkqr4iRxvu07C8JQceIYVnravaWXGo7uYCt2UMdfEBQE7EZs8oHA6VevnK+yg1k5V7+bE31HenQ1SUeULM6BdfGnbmw== 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=Apb2arpVeOqHDJs+z7RI3HGryl/2mDzB8TMmoyJ/ksU=; b=DJTnG2OGb5Adm7re9uYoRTSmghUCZe7Rq/oCVIXkpAjozBI7U6HQ1rLYhVImPQTpctSl3ouwttUOnGJatNnVRXuJNtFiRhH4fr1h9LYmERYUdKCWg98pMQZ96g/zvZmLstEAcJDrou/k4TYDKFJdN1sS6Yw+GVh3LopqUXHQ60A= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, Max Reitz Subject: [PATCH v3 05/17] iotest 303: explicit compression type Date: Tue, 14 Sep 2021 13:25:35 +0300 Message-Id: <20210914102547.83963-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0010e26e-5100-494c-fff5-08d9776a12fc X-MS-TrafficTypeDiagnostic: AS8PR08MB6071: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dN7bZVgiZExFM2fPCkfSQq85spGBmp0AJZ4cZsgPsttQD41uva98wDZoBehE7fHW6heTcEVhfQxAVzhHlGE5neZcMmgmjnvIZKETrOg2js+OHlyx0bqHKswo1IMkeJ+gd7hvLF4vt28SfGuNZ8XX0ACOL/uCVqACTi/uNTij1/gLa4P1jeBUJF1mmA3FAnlEShbG4zmt2K2yPdRKke0A1nCDm/asnIi3YCdUt/xpe/QpWms20vvJ7+mtfL3AUzApVNt9A1x90/MapBxiy0sJ3RZaVop8JoFGo11nWKARsjHYv/ouaBkUbNFRPoKCcXrbKon4FIMd0at2H+uHu9LumZAjd/pX51tjh7lsI3c6EDdR6/sk+Xnc5djyENYoY2Ekz3yZQdZcPRfwkg5VuA/lGmJ1sHAXAme8WnmlBp1NImzJiApj5i/jmzHF73iTzNatgGfoGz5z5otuXoPXVYvO8HOxyGs3ktSEVpJYp7x8nDysPIIdXhuH3XUXJl8PMKyxAqsCHWZXl3IU3lk+YJdfiSMH1PWo3wzm8lckIdxunQuVJScGYKfCgboKj+q3Gwm8D/kC9t45XyhTte3/Z4nlqY7EFPyy+0TKkpUWOFo8/JYa5GB+2RIx4GsWkzrIB0MrQ9zpegAdtJXS1m9D8QTTrxV6+0fuOcLXei/xZkviInL5F51T09h/uFA+jUIMNdpvoe2WwmhfrnfhH0++ChQscISwO/M8Ak5gV8oU8mGik0c= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39840400004)(366004)(136003)(396003)(6486002)(26005)(86362001)(2906002)(6666004)(38350700002)(66476007)(38100700002)(66946007)(478600001)(8676002)(36756003)(956004)(66556008)(1076003)(186003)(6506007)(6512007)(6916009)(83380400001)(5660300002)(2616005)(8936002)(4326008)(316002)(52116002)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ViySHOqqtThbsxRZ5rzMCW1G1zJHechUX94GWg4QIB7Z6a14vAefro2c/6sj?= =?us-ascii?Q?muoyGW2K2VG6rLiWz+S6ZW4E3A9/u+i9zVUHnQi0U2VLuigOgwmWaZHQ66Sv?= =?us-ascii?Q?nL66HpJhE5j43GxNKRrvJk7CVmQ8qa15zYbJ7dXgq4t+WhdmaVnqM9VCYsVJ?= =?us-ascii?Q?HSDVbq2cL6P5Di+7bV5ClCcSf5t2Pgxk2F+bDmQzP+7S5tFzIwrxi47cRUvX?= =?us-ascii?Q?sHkKr5CVx5o2vGabnNsY8A/Hxc57+qn99cdPZTXiXs/9Ghx9qkE73wFckzvx?= =?us-ascii?Q?9m6TSbDjyWCAHg33ovonS7s3ZIlJLW/2fcPjEJ8y5b6hcvnUBilFUlT2NW6y?= =?us-ascii?Q?QRtkJJuPbiaWjz0hFpplISjVTcjPlhSclCbWVWZaMfyPVjk2gTENDJxWMhJK?= =?us-ascii?Q?8tJQErw9TeHBiXf7CoWdtZiAZj3hVLosRpsv0sgsFV+6n6I2RrM2qEltN2ZJ?= =?us-ascii?Q?5qXdzbjYVyKCR7Mx8JCdYIs4HBCSVxT9ETrUvaeE9zo5on3BGd1U76nI0gt7?= =?us-ascii?Q?UTZI8gt2o253VMgArFVZlMEvcpN/j2SjHncqC95nDrb5sepH6jgVF23ZbM4N?= =?us-ascii?Q?+IFx/IHGeZpLDz2ZAhTVny40kMlfFw0Ho7u9606jPK+KZIw4hnRDJ3DJeoo2?= =?us-ascii?Q?ewq7oxiNmwwEUpUAknJxzdLEHa1wxAKCgwMneY1vkHu0246z/OrqiZja0Oij?= =?us-ascii?Q?YQtHuN8M6ocamYjfU8IVjdRYJLRBNpUkVM23rU6293OdeyKGvA+HmLtozWbJ?= =?us-ascii?Q?jYzP8soqrFGMG16T4w+AjyTHzpmhgQeigL1tfVFSad7kZB1qLIBjRZG9yY3i?= =?us-ascii?Q?9ZX3Pje6KUFkbKQOESEv68UyppAMWm6fOUPqLjimfKIpIgS57roKUTl/7ve3?= =?us-ascii?Q?IzrDmXdRtbbPscuaPotYcn04OfIUUfzlGSBcEAEi03rDJ6scOFDZLDx4fStJ?= =?us-ascii?Q?Vz3uKAKT9AcJ99krzgBWlmrGDvTrKtCyjRbrxx4fuYFLuU+yqbA9/JtJzpa+?= =?us-ascii?Q?n0Vn3OOXZTMIFAK4JSMP7S7JYqowU9N6bl//NhU4PKr8yPLZTxnvoqXEKYWf?= =?us-ascii?Q?yvo5ZUI77wHanFNnGBCCGYemjHSIm6TBJJalHffVyCr7V0dmJK0RDDXeSpOo?= =?us-ascii?Q?QEwqf/ZAELtQQOrIkAFicpwljUErxfYby6Zfek99nFYvpYIEfCRyU+RuduGL?= =?us-ascii?Q?n6GH5uKHy+wGq13vcW9QeTUfq5hg3MQTcU4Z020bWWKXLbImJCUwWQeBRShL?= =?us-ascii?Q?kd1k+NNZhlN87Cht+VPGaW5iRdXcqN4Z+5il4HXii9klMg4wzVHf7XkvOPkc?= =?us-ascii?Q?fhzdy1dJXcw6CARyMZRqomoz?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0010e26e-5100-494c-fff5-08d9776a12fc X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:11.9828 (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: tsObtvBCf9xyholdJ/TTrJbRWd/JMS2gFb6loFhePc6B65oZ5UQOvj//HxW965+ij2Txta1Mt3beJ23Bf3oOIUrJzkERpQPTZ+VXIiUNF/w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6071 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.20.115; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631615510371100003 Content-Type: text/plain; charset="utf-8" The test prints qcow2 header fields which depends on chosen compression type. So, let's be explicit in what compression type we want and independent of IMGOPTS. Test both existing compression types. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/303 | 25 ++++++++++++++++--------- tests/qemu-iotests/303.out | 30 +++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/tests/qemu-iotests/303 b/tests/qemu-iotests/303 index 425544c064..9dee2bdfb8 100755 --- a/tests/qemu-iotests/303 +++ b/tests/qemu-iotests/303 @@ -53,12 +53,19 @@ def add_bitmap(num, begin, end, disabled): log('') =20 =20 -qemu_img_create('-f', iotests.imgfmt, disk, '10M') - -add_bitmap(1, 0, 6, False) -add_bitmap(2, 6, 8, True) -dump =3D ['./qcow2.py', disk, 'dump-header'] -subprocess.run(dump) -# Dump the metadata in JSON format -dump.append('-j') -subprocess.run(dump) +def test(compression_type: str, json_output: bool) -> None: + qemu_img_create('-f', iotests.imgfmt, + '-o', f'compression_type=3D{compression_type}', + disk, '10M') + add_bitmap(1, 0, 6, False) + add_bitmap(2, 6, 8, True) + + cmd =3D ['./qcow2.py', disk, 'dump-header'] + if json_output: + cmd.append('-j') + + subprocess.run(cmd) + + +test('zlib', False) +test('zstd', True) diff --git a/tests/qemu-iotests/303.out b/tests/qemu-iotests/303.out index 7c16998587..b3c70827b7 100644 --- a/tests/qemu-iotests/303.out +++ b/tests/qemu-iotests/303.out @@ -80,6 +80,34 @@ extra_data_size 0 Bitmap table type size offset 0 all-zeroes 0 0 =20 +Add bitmap 1 +wrote 1048576/1048576 bytes at offset 0 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +wrote 1048576/1048576 bytes at offset 1048576 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +wrote 1048576/1048576 bytes at offset 2097152 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +wrote 1048576/1048576 bytes at offset 3145728 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +wrote 1048576/1048576 bytes at offset 4194304 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +wrote 1048576/1048576 bytes at offset 5242880 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + + +Add bitmap 2 +wrote 1048576/1048576 bytes at offset 6291456 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +wrote 1048576/1048576 bytes at offset 7340032 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + + { "magic": 1363560955, "version": 3, @@ -94,7 +122,7 @@ Bitmap table type size offset "refcount_table_clusters": 1, "nb_snapshots": 0, "snapshot_offset": 0, - "incompatible_features": 0, + "incompatible_features": 8, "compatible_features": 0, "autoclear_features": 1, "refcount_order": 4, --=20 2.29.2 From nobody Thu Apr 25 01:48:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631615481; cv=pass; d=zohomail.com; s=zohoarc; b=c3Jf9BWucEw+Gl506XGgALorhi80tcotcR8qptw0ekn5u+ldFr63ajj75ZdOU5Vod1qFugxsMqheiYiMLnopY7rnatG5UusvoyWITMHQiJxF3uXMURRQhCW3xbGSIoGuyikHZwq+YAmL42DRBmNivBC/Ga6HHfGAfVEQDPnC9fc= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631615481; h=Content-Type: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:References:Sender:Subject:To; bh=flq75acknG+EaYufWDuGar4fGO8HKuqo41kMyvDMz1g=; b=RXt14xmlGoJ2/ISzTjvX3di5/sjyb0UnMECXculyP15tFN5nE/akotKtXEnkSUr8g/y5hWbeK+SSO2aE0jYElgQflMF1cNOXba6uiPiVKrxedHFMEQESlqNKMS9iK+Q6N3uYjGvrtD56h8yDcY30fLx0j1Snk9Lyj+M4an0GFVI= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631615481865930.3765323647212; Tue, 14 Sep 2021 03:31:21 -0700 (PDT) Received: from localhost ([::1]:59168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5ii-0004LS-QG for importer@patchew.org; Tue, 14 Sep 2021 06:31:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5dt-0004Rv-7M; Tue, 14 Sep 2021 06:26:21 -0400 Received: from mail-db8eur05on2115.outbound.protection.outlook.com ([40.107.20.115]:20224 helo=EUR05-DB8-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 1mQ5dr-0003Ok-DL; Tue, 14 Sep 2021 06:26:20 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6071.eurprd08.prod.outlook.com (2603:10a6:20b:29f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Tue, 14 Sep 2021 10:26:13 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:13 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oEOKFYRVEcPcwSFiHh5YXS7qqHhl0yxvDvXOz/6lRjWokZ7hqaqAr57buf7Sczg+QFgFA3VwAGBZ7SVlvJohbisV9hkb+nA9nReC7vWwVGdTSB7ylr00/jgbq70a9ewBQBtAfwNS595I6K/SEJa8MqDY9z0Qw8ibiw8obdxea17fjC0d94lfJDKt3TKqAuKPX8MUjy5K77TkzLf4FHPGp+Ai79bPUnbBtHqU7Z8u/SdkRtSRJYrd+/2uNDPJ12TsUrGg5EfrqLzCAU3vOQeBgbVXppmd03ffx0Kwye6kYFYJmVRPcqFLJFtM0estiA7CCR+weEXNe+7mgbw+2JHe4A== 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; bh=flq75acknG+EaYufWDuGar4fGO8HKuqo41kMyvDMz1g=; b=fxeLFq5L3leIIvKNfsztpNvzEGBC7K1YwGFo/aw92+hPkCJY0adg6grNvhnY/gLvIiLFsarBZWsrDUqrAJueH96OZtLHNg9hbxmO+XnDUE+4jPBgOa/5IoezsN4IVxCKiJlITmuC2NCqegsVpLivm6hflWXod/w7VI9GhZkVyWdOs9IhBRzjx7xE/ZkFhw1HXCGYoTkvOdjDdnV2arJw07RfiTrjUn0B9xVFIunlY9Xgc8YJBno2wq24cm8P0n8nrm8bE0nqCOx3xIpELSLJwVrVY90elmzER3BUt8anhZfQAs1VEfYwfWHm7s2IFxRNtUivo/hCEg4CK8R8zduqzA== 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=flq75acknG+EaYufWDuGar4fGO8HKuqo41kMyvDMz1g=; b=aQFfDkmdtK9OVX5NQrqds8uF7kAE5hkwOP2QkAQrd/1BWPXdSzQjm4VvYFdLDKekkqMCP3j+rFipsXOlTXsfq6q357hZvGRXR8iJdjeG5HfTtPbMV1OsNppqjPAI53RtPlIcvwTBNLeyC7IcIxbhKuUCIMuZ4lGSh8ZDj4iND78= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com Subject: [PATCH v3 06/17] iotest 065: explicit compression type Date: Tue, 14 Sep 2021 13:25:36 +0300 Message-Id: <20210914102547.83963-7-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f327699a-33c0-487c-2cb3-08d9776a1399 X-MS-TrafficTypeDiagnostic: AS8PR08MB6071: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2887; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DsWhO/njih/cC4QrnbK3SYIvrnARzAiSSxqgVv2tYRIOclHuJxS0fOZlXloltJX4Y5jZDM+sdmu7Cvx1PA4TiDoonV4wVPt4JYn8umHjFV0hUmVnaGEPyYxSga+sI5GKBucyOSBFm5Mb8jvYHnF3IStNqojpigE2JIjzTYRZ/+QHjL9P1Gt7j1ynIbYs70X0LBAuT6vXe1UxG64CV5AhRBUPLplm/rk+bRblXdaWHISsKtWBVgG/ttKjmiCbTMix8EkrAseCVwQgHb7hreTkFajqMF+yU5w10+KvXhildrY8Khf7vHDqqufR+M9FKdCd+Vu7clG9ifyAFMAq2tvnd8EZmi3AkgP2PW0dpRpSKrXURsmRV5Ltw2o5YIkRhQhkViyNKESPaUvKwo7wyFI9hvlqK88HBgdtYg7Oq4GZBNjsIDgOl3VNlMJq9K1ZCVtazeSi0RpfGefwOTobTUbeToDNISy+x5+DS2JYaa6WL80qGE5FFdp6xhgn3CpfZPkPx1hNLw2ECLkbz9LjhYlnpmeTJgj1B5mHs9InmarLf9NRo7HnWAW6gQgbAAfHaR+TH3BRM7NZ1KZlG0Ftn1IsHHmNUTffJVYsDM5F/AQJhLvrs6TYOnhdA6NWv7CO90h55oUGWIJtcIaTGf6SHeLD2kb8AOi5icHJmm+0VuB3hl//iwFM4Veza6exMdPLOOd0AGFBoDHsB5TiK+wvyQ4/Sw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39840400004)(366004)(136003)(396003)(6486002)(26005)(86362001)(2906002)(6666004)(38350700002)(66476007)(38100700002)(66946007)(478600001)(8676002)(36756003)(956004)(66556008)(1076003)(186003)(6506007)(6512007)(6916009)(83380400001)(5660300002)(2616005)(8936002)(4326008)(316002)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/WoG1zx03t2SaM7NZ1obft7P8kqFx6Z5Qv1uwBE10pkl/tl73mXcJHkZm56I?= =?us-ascii?Q?QjWmhv/f9wZV0chdfPq1FccWCZO8YIHIWIu+ahxwWQujgcXvmFHcLAb//kfk?= =?us-ascii?Q?gdure334NgJXm/gw9DUP1yackl4v+3NN4lUTJaZD3K1ArA3pEvx9pjVCM+qa?= =?us-ascii?Q?yhqAcqgK87K8iCoWD9irN+gk8PNqUt5PbvDCX5opX3Ed6+Sr5aTu7XRZgnMi?= =?us-ascii?Q?em5RC4rHDDTDHSmgb6v2M7NOOm3PHroz29e7Iv6ztOwgM728OHJpZJr3joci?= =?us-ascii?Q?tHtZLzj4+YrFvQT1QHf0Qa2EEbLaCcUmXWsUAxtW2Kue10PZi3KyvBO66vLP?= =?us-ascii?Q?pKenpV6PpIJE9dyKqTcjAp9S71I/Dz7xyJUEG0XLeepzHR05sFJ9aNw1f/qx?= =?us-ascii?Q?fAm7mQtrGt0LQ6a/Ayg+7PmwmLgReOiLmATw+t9jvgro/VCxmewH3S+o89rE?= =?us-ascii?Q?oy+C8F4dnegKZ5wGTKtlSVKDiCootSHAG+t4gfAss35jYx3Br7U+Agmlt/kr?= =?us-ascii?Q?/MU5aSwxNlI+ZyYg6nVFivdKVDZBqgnAIf8++ccdQ+ml0pnttQEctzLpcQb6?= =?us-ascii?Q?SCJU73jnwogyT/0Pxi2GTssWk/02U62ahKtJoZi/9vZ29piIkkcE6F1zGxBb?= =?us-ascii?Q?HLCSKfUPq1Y7wVSOIWgzHxdTcaw7v6YMLNhTGE2rzlG/5MB7SA0WycuK6FxK?= =?us-ascii?Q?Nfpus2DmjqQCaJmvq6H+ed+TEOQbRi5ztN4HSxj1BOW9cbY+L4043QfjHguN?= =?us-ascii?Q?Fj2bMZm1v6G+RPwndPyCwenJ2GjhAUa3tuJ4YJcDE1AxTDs5bKmE12mQ74vE?= =?us-ascii?Q?EJzCQo+aBmb3LKHlcikkTz15g9ylk0lPzO5wI/6RdmhtHaqJKT22tUgbTcgB?= =?us-ascii?Q?OfUBUAp374gDucj0WIjVxIsSyMK02w/6gXFD4PeHMipr6LFCnOvObMLdMOmX?= =?us-ascii?Q?wNMRaZv2TM76C0XuFk6e0RzdW5cSZivuZlJpn6AGsa4vafEsgWXcEielSH6u?= =?us-ascii?Q?oyQNoZILoht3Tw/JiHGmHt06IX4nlFW7t3iYPrxGzX1l2QybpSL5Ue1cybAj?= =?us-ascii?Q?s2oM/ranOF9XPyb0RaKWXnH93CqfR8fPo0iZosQfk+XJDCGhduDjtUk/afDF?= =?us-ascii?Q?0cWyNNX1TwVa9MdrHLQ9xjqRsOAB8wSndxMtBt4XsREsXYRoTGQcWsi76jQ6?= =?us-ascii?Q?QvVqmqow0fMw0TsLiKgNY2Tfnn4hfZtI4YazPMQTQ5MBzJ1gSuR7GRZDsQEU?= =?us-ascii?Q?Zx0WyonqcEes4Gm79uA5lhDERDGaGfxOn+zjsAj4G/lMzMEUsyHtjZnJtqYI?= =?us-ascii?Q?L577aPt1ZeJrrN6SQAHiT5Ho?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: f327699a-33c0-487c-2cb3-08d9776a1399 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:13.0153 (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: 1QqzuAtfMs9S/UKUC1ShTbw1i2wVmMWPxRaN/SjwBrvY9aVpdwaloMkgzW1D4eR0JNse0PLbUE5dLNM3VfXKlX+zYNgCxRVKuVEleh+XRMM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6071 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.20.115; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631615482641100001 Content-Type: text/plain; charset="utf-8" The test checks different options. It of course fails if set IMGOPTS=3D'compression_type=3Dzstd'. So, let's be explicit in what compression type we want and independent of IMGOPTS. Test both existing compression types. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Hanna Reitz --- tests/qemu-iotests/065 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/qemu-iotests/065 b/tests/qemu-iotests/065 index 3c2ca27627..4b3c5c6c8c 100755 --- a/tests/qemu-iotests/065 +++ b/tests/qemu-iotests/065 @@ -88,7 +88,7 @@ class TestQMP(TestImageInfoSpecific): =20 class TestQCow2(TestQemuImgInfo): '''Testing a qcow2 version 2 image''' - img_options =3D 'compat=3D0.10' + img_options =3D 'compat=3D0.10,compression_type=3Dzlib' json_compare =3D { 'compat': '0.10', 'refcount-bits': 16, 'compression-type': 'zlib' } human_compare =3D [ 'compat: 0.10', 'compression type: zlib', @@ -96,17 +96,17 @@ class TestQCow2(TestQemuImgInfo): =20 class TestQCow3NotLazy(TestQemuImgInfo): '''Testing a qcow2 version 3 image with lazy refcounts disabled''' - img_options =3D 'compat=3D1.1,lazy_refcounts=3Doff' + img_options =3D 'compat=3D1.1,lazy_refcounts=3Doff,compression_type=3D= zstd' json_compare =3D { 'compat': '1.1', 'lazy-refcounts': False, 'refcount-bits': 16, 'corrupt': False, - 'compression-type': 'zlib', 'extended-l2': False } - human_compare =3D [ 'compat: 1.1', 'compression type: zlib', + 'compression-type': 'zstd', 'extended-l2': False } + human_compare =3D [ 'compat: 1.1', 'compression type: zstd', 'lazy refcounts: false', 'refcount bits: 16', 'corrupt: false', 'extended l2: false' ] =20 class TestQCow3Lazy(TestQemuImgInfo): '''Testing a qcow2 version 3 image with lazy refcounts enabled''' - img_options =3D 'compat=3D1.1,lazy_refcounts=3Don' + img_options =3D 'compat=3D1.1,lazy_refcounts=3Don,compression_type=3Dz= lib' json_compare =3D { 'compat': '1.1', 'lazy-refcounts': True, 'refcount-bits': 16, 'corrupt': False, 'compression-type': 'zlib', 'extended-l2': False } @@ -117,7 +117,7 @@ class TestQCow3Lazy(TestQemuImgInfo): class TestQCow3NotLazyQMP(TestQMP): '''Testing a qcow2 version 3 image with lazy refcounts disabled, openi= ng with lazy refcounts enabled''' - img_options =3D 'compat=3D1.1,lazy_refcounts=3Doff' + img_options =3D 'compat=3D1.1,lazy_refcounts=3Doff,compression_type=3D= zlib' qemu_options =3D 'lazy-refcounts=3Don' compare =3D { 'compat': '1.1', 'lazy-refcounts': False, 'refcount-bits': 16, 'corrupt': False, @@ -127,11 +127,11 @@ class TestQCow3NotLazyQMP(TestQMP): class TestQCow3LazyQMP(TestQMP): '''Testing a qcow2 version 3 image with lazy refcounts enabled, opening with lazy refcounts disabled''' - img_options =3D 'compat=3D1.1,lazy_refcounts=3Don' + img_options =3D 'compat=3D1.1,lazy_refcounts=3Don,compression_type=3Dz= std' qemu_options =3D 'lazy-refcounts=3Doff' compare =3D { 'compat': '1.1', 'lazy-refcounts': True, 'refcount-bits': 16, 'corrupt': False, - 'compression-type': 'zlib', 'extended-l2': False } + 'compression-type': 'zstd', 'extended-l2': False } =20 TestImageInfoSpecific =3D None TestQemuImgInfo =3D None --=20 2.29.2 From nobody Thu Apr 25 01:48:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631615634; cv=pass; d=zohomail.com; s=zohoarc; b=TUBNz7AVoBQTsu6LeFAp7HvRyho4YfO/5Vg5mWCce9HdyiQGT3eCxKwkO9wVbO5bQW/WEbaL5+OWceQgpY+JJYWVzHbjzjvcR22HjJCTFHM2lSckpvH5z1oyAdgpUwFHhxXyPidq3LJtTPcjoGbtLmXpfMSArG/Kwqq4rukJk+0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631615634; h=Content-Type: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:References:Sender:Subject:To; bh=JlZE4P7i38gKDOeuGeVLpFFKQtK91Oeo9YgMP80/7II=; b=fUWiPwcYXXCRAHPVxKXaH8neUlUaTn0Hm5OkFnNhZEqHfadRlOmSsYHAgp2fL3f3LqhK8BKlIRZ0vTdUa62fNJxlA/ujiRf3apIgL+sJ4fHvlT+VlwJkYLIpg1EcRmoW+cVc0PK/3tHPc//6FopQL3WHLYgxBUss7r6sqte/mKo= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631615634529447.38549653092025; Tue, 14 Sep 2021 03:33:54 -0700 (PDT) Received: from localhost ([::1]:40142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5lB-00025B-Br for importer@patchew.org; Tue, 14 Sep 2021 06:33:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5e1-0004uO-6y; Tue, 14 Sep 2021 06:26:29 -0400 Received: from mail-vi1eur05on2115.outbound.protection.outlook.com ([40.107.21.115]:28801 helo=EUR05-VI1-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 1mQ5du-0003UG-1O; Tue, 14 Sep 2021 06:26:28 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6071.eurprd08.prod.outlook.com (2603:10a6:20b:29f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Tue, 14 Sep 2021 10:26:14 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:14 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eslE4Gdqhy308uW+ajoU6uco4snh2zpVQguVPNaXcMOZ8OEE5Su8l260VV1NskGMnaYn0ssjnfydTkJtPXMOnuM1WiAycygTjXifGsK1UOPrZq0KEeeQKKrTiJn9yQ5xUNUT3Sag0Gb+Su8iScInzbe6KVutYy4zPNaHqvt6Sommrr6EFLsivASqlC6UIAlIiwNUF9ukmzr7ErerUTDOdkEOlW2CAh30ZuHG+omtpbicKd5dSv+hj6ixzZ8K7+5Al/nmDIiM4N8U0KWk9q/dwjucIxUKwkrcyVcdG8Rp9vHjHbT9hoiEJgweXX3E91R49CyBI+cdiO+gtgyuzqQNEg== 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; bh=JlZE4P7i38gKDOeuGeVLpFFKQtK91Oeo9YgMP80/7II=; b=EVHVkFcBdGDiPm4ktouRD9qmGF+doBWXxJWjAONe5ylvSurOdB5NDNU/vyhhXN/Me80s70V8ofBI8pbaabmit4wCW5XdG5A8b9CuqX1KCJzTkXL93CRfkyrmqfokPkA15CzYxgdwKsfEpUdtgK/elit5g5jgegSfpm+fjSOcl7m0e8vVfLQpAv/xmZFuVYoY4AEnc+uuE4fkvT38tLE7sV5J/zKRZcBwRWmZw8ewyE/LIwT93wTPt7p74nLD2boVVjJjtbm0f7fg+gUg70d9N/XwXmBbE922vkvO/WHIBR8GzIo1U4JkvkS+MIbRmBZP4u+yHdXmGsIl0bvoHN6njA== 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=JlZE4P7i38gKDOeuGeVLpFFKQtK91Oeo9YgMP80/7II=; b=nHbnhG+HzRsLlH4Sn+YiVr84dzZuBRXpzpt5YdT3xSiLw+9hU+b1Uro46LLvvEil3B4BVvTMPo4vFBdrR3IMvEooXZzn3KxzkUrHfi/dKZlbxd5O7UYBEnvWK+Uzk+frXpdmsdw5AR4IwkktJzpseYfX0hg+GPFdeybjYzJQCIY= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com Subject: [PATCH v3 07/17] iotests.py: filter out successful output of qemu-img create Date: Tue, 14 Sep 2021 13:25:37 +0300 Message-Id: <20210914102547.83963-8-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9ea9bb30-65f1-4f89-9713-08d9776a1434 X-MS-TrafficTypeDiagnostic: AS8PR08MB6071: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:42; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NIlYCoYHuwevs8lMK/QsdE0xXD2/J7DpeJlO9RcwqK71UtOxUAAXIh5AdFqoGpYH5i0VUn2FEfiY6hVgQwBdz4xpVmvYT1MXDgV5d8GXMKvrmLYYkHDEJZR1FPfpcygwiq8KLTgTmw0aL8aWpd5/Z8n8tGo6FB1Z1TyO8gD0rtJ6XaYoMTdujizhPZpEn/v91yT2sNVM0pAYX+lxjeRitZt2EtahwEeG22DZFSnGeLgEKJ5yRlXkoNvuIpqjgwLCeQYbay1hdxWgafZq6agtt1euLyxeDaC9Rj9m+jX8s9f7zHgmuePFKOwNDPQRFzJM/Aa/82VcswlBoMf73fGzlLWNSKj64uU3ZTxzmf7IdsP3rgd3sPvkNEYh02MR+wPkcGp8sUmmSZddr0A3yOF66BdtmUoRcLJ1q8TiB7scyZ6ewTZhww2R1dvBTvgJvRVU4cxXnD8pIhXThkj/1hsIuX/oM6qXIBbsq0fgGdrw3SrgwHj2A9BfFl5OfSXhDzscvAIskt3qo/fBiM/JU7CrI2VJj4Ax/ZPi2decjUfiroQ9GYOpldZxeMzexA16WjGrXSdN/6/N6YttM3fsH8CXZ5N2HwCEJtxmQ8ej3+k/XG65HAmrMcB1IApp/v+6wxMnpeBS0E3MuLbkEOke4EyAx8D7bZJHdb+5Ay3EjUorVE6xW4v8P9BPrmF8DFYR6E0wULKnrpsbXTw/ON0/lGVe5qS7w1HCMS2UAZMn34Bd1VI= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39840400004)(366004)(136003)(396003)(6486002)(26005)(86362001)(30864003)(2906002)(6666004)(38350700002)(66476007)(38100700002)(66946007)(478600001)(8676002)(36756003)(956004)(66556008)(1076003)(186003)(6506007)(6512007)(6916009)(83380400001)(5660300002)(2616005)(8936002)(4326008)(316002)(52116002)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BaQNvWuQfKdxNe1qVlpFKPi0JYCMtNNGho0CBv+6ye2/nX+/0kUB6k1ZY1+W?= =?us-ascii?Q?aVUlJjebk7IKqQo9YSaN4ao2pkTZwy5ejpeKJ+/TZzD4pJKfqeP0HiHj1JI6?= =?us-ascii?Q?vf2k06cj2ughVoH+VOInB+jpmjI6Lil3PkFkhocwJ0XcCnMabEtkVmxm0hTv?= =?us-ascii?Q?fbOGvHNLGjmVqUniQU2tDXSgtsHaNgroAAOcYrDJALTwc8ri6tRx04eUazK0?= =?us-ascii?Q?fYhDb9WJIbv5YayyeT/pViBRuabe2FMV9wAXcjmLRdYUgUtTiFH6lggUQuXq?= =?us-ascii?Q?JYngt8bQKOPt7kGfeSNDfMtiBNgI0Xn2j6V1/K8tgUj3QAtqKkHNspWrR32t?= =?us-ascii?Q?5q4Hjkct9VIiHOraLT9mw7EcGGmDCiM4cT6t1kdDqLj4H5iNadOdvQjEgFFY?= =?us-ascii?Q?352TqrtJ6FcC7GjIAKp9q46kDXWNohzJAdV85CLmCm14MuV4FMJHu3r642nF?= =?us-ascii?Q?+6wm5VQZlxYhfSdjScAAOxCZ/6zx5PW+iGwm3RcFUw9g/GnZPC47zaualyGB?= =?us-ascii?Q?mZzt+9MIMaVZaS5RpJ3x1p7giy/t+PTe0esgglNTsjpOD2etOOrM9NGwyj8n?= =?us-ascii?Q?0FqHNKiHw7H4v+6iwCbtE23cEwHGBPjsbIbQDBgV0cgntvSI8ggo5ws4YtpG?= =?us-ascii?Q?2csFlHphweN0b/ReN9JTfhFuLovtjFOhqty3ighP0RSO/Volmfnh3S9HKhQt?= =?us-ascii?Q?pk66/G5oooFAyhoCWdheA4UWNme5zVSgEE0trXe+l0+p1Ub/JYEifSLy7Teg?= =?us-ascii?Q?wvdiv7WM2vxVrHFP+5DRhggB/9o9sIIvPF3oyGmZOEWFSCUSpoChmZw2NUes?= =?us-ascii?Q?NMUU1WLQBHRwT9w3BvmnPWtwieARtVAPhF7X0WDGgp+/wrriB3f3mXNZKbGC?= =?us-ascii?Q?QUCR78U4eg7IjK552iSg2BaO2YyCeWv/dbLN8FbFF0phzgU8xD4XicLhj7UK?= =?us-ascii?Q?KpTafIFaYUl+vtHlPBmD6LggWCQ8ClluQdTXTKjc2XtnhCORhLaaiFpHbqni?= =?us-ascii?Q?mWsYsFNxCJGdcBv1jujNApd2KQOzopqlZwY7ltuAci1M2+fadkp9VQprLOJB?= =?us-ascii?Q?fptjVSKgvI3vukp7rveCkAGi0S520MzUhKiYRZ9UzRcIeUS5rgJ/PiCKfu4i?= =?us-ascii?Q?2irRc1iMPRimxSVmxPbaeYz7W8A8JRf1gPrfdEwBfIRtmxBogVtSmH/i3llK?= =?us-ascii?Q?HFxP2QiUi2mALLhMJov3bsMGVFT3VadIffyMsxu98MuBz1DseCMAoXg9D37Q?= =?us-ascii?Q?XKJAZPKiuNPFOK6TK63Xod/2Du6f+cUsCc0t6bL5twtx84FBG+gyGeNTFucs?= =?us-ascii?Q?8xtzV4+CahGlEGAnrtsBMQil?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ea9bb30-65f1-4f89-9713-08d9776a1434 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:14.1364 (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: ZyebPDhBISjG/stCOeUv+ia7BynYF1ayTBMbV2irYuTAsiGzJEP0+rVtoU2taSfr2fPZYHC+Tj9z5rKI06wuZxTuJKQlPVZpsD7c9rzCJrE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6071 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.115; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631615636217100001 Content-Type: text/plain; charset="utf-8" The only "feature" of this "Formatting ..." line is that we have to update it every time we add new option. Let's drop it. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Hanna Reitz --- tests/qemu-iotests/149.out | 21 --------------------- tests/qemu-iotests/237.out | 3 --- tests/qemu-iotests/255.out | 4 ---- tests/qemu-iotests/274.out | 29 ----------------------------- tests/qemu-iotests/280.out | 1 - tests/qemu-iotests/296.out | 10 +++------- tests/qemu-iotests/iotests.py | 10 ++++++++-- 7 files changed, 11 insertions(+), 67 deletions(-) diff --git a/tests/qemu-iotests/149.out b/tests/qemu-iotests/149.out index 6877ab6c4a..ab879596ce 100644 --- a/tests/qemu-iotests/149.out +++ b/tests/qemu-iotests/149.out @@ -61,7 +61,6 @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha1.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-xts= -plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m= ode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-aes-256-xts-pla= in64-sha1.img 4194304M -Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha1.img', fmt=3Dluks size= =3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dxts i= vgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha1.img = qiotest-145-aes-256-xts-plain64-sha1 @@ -181,7 +180,6 @@ unlink TEST_DIR/luks-twofish-256-xts-plain64-sha1.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img twofish-256= -xts-plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Dtwofish-256,ciph= er-mode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-twofish-256= -xts-plain64-sha1.img 4194304M -Formatting 'TEST_DIR/luks-twofish-256-xts-plain64-sha1.img', fmt=3Dluks si= ze=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dtwofish-256 cipher-mode= =3Dxts ivgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-twofish-256-xts-plain64-sha1.= img qiotest-145-twofish-256-xts-plain64-sha1 @@ -301,7 +299,6 @@ unlink TEST_DIR/luks-serpent-256-xts-plain64-sha1.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img serpent-256= -xts-plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Dserpent-256,ciph= er-mode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-serpent-256= -xts-plain64-sha1.img 4194304M -Formatting 'TEST_DIR/luks-serpent-256-xts-plain64-sha1.img', fmt=3Dluks si= ze=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dserpent-256 cipher-mode= =3Dxts ivgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-256-xts-plain64-sha1.= img qiotest-145-serpent-256-xts-plain64-sha1 @@ -421,7 +418,6 @@ unlink TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img cast5-128-c= bc-plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Dcast5-128,cipher= -mode=3Dcbc,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-cast5-128-cbc= -plain64-sha1.img 4194304M -Formatting 'TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img', fmt=3Dluks size= =3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dcast5-128 cipher-mode=3Dcbc= ivgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-cast5-128-cbc-plain64-sha1.im= g qiotest-145-cast5-128-cbc-plain64-sha1 @@ -542,7 +538,6 @@ unlink TEST_DIR/luks-aes-256-cbc-plain-sha1.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-cbc= -plain-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m= ode=3Dcbc,ivgen-alg=3Dplain,hash-alg=3Dsha1 TEST_DIR/luks-aes-256-cbc-plain= -sha1.img 4194304M -Formatting 'TEST_DIR/luks-aes-256-cbc-plain-sha1.img', fmt=3Dluks size=3D4= 398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dcbc ivgen= -alg=3Dplain hash-alg=3Dsha1 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain-sha1.img qi= otest-145-aes-256-cbc-plain-sha1 @@ -662,7 +657,6 @@ unlink TEST_DIR/luks-aes-256-cbc-plain64-sha1.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-cbc= -plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m= ode=3Dcbc,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-aes-256-cbc-pla= in64-sha1.img 4194304M -Formatting 'TEST_DIR/luks-aes-256-cbc-plain64-sha1.img', fmt=3Dluks size= =3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dcbc i= vgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain64-sha1.img = qiotest-145-aes-256-cbc-plain64-sha1 @@ -782,7 +776,6 @@ unlink TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-cbc= -essiv-sha256-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m= ode=3Dcbc,ivgen-alg=3Dessiv,hash-alg=3Dsha1,ivgen-hash-alg=3Dsha256 TEST_DI= R/luks-aes-256-cbc-essiv-sha256-sha1.img 4194304M -Formatting 'TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1.img', fmt=3Dluks s= ize=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dcb= c ivgen-alg=3Dessiv ivgen-hash-alg=3Dsha256 hash-alg=3Dsha1 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-essiv-sha256-sha1= .img qiotest-145-aes-256-cbc-essiv-sha256-sha1 @@ -902,7 +895,6 @@ unlink TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-xts= -essiv-sha256-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m= ode=3Dxts,ivgen-alg=3Dessiv,hash-alg=3Dsha1,ivgen-hash-alg=3Dsha256 TEST_DI= R/luks-aes-256-xts-essiv-sha256-sha1.img 4194304M -Formatting 'TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1.img', fmt=3Dluks s= ize=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dxt= s ivgen-alg=3Dessiv ivgen-hash-alg=3Dsha256 hash-alg=3Dsha1 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-essiv-sha256-sha1= .img qiotest-145-aes-256-xts-essiv-sha256-sha1 @@ -1022,7 +1014,6 @@ unlink TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.= img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-128-xts= -plain64-sha256-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-128,cipher-m= ode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-aes-128-xts-pla= in64-sha256-sha1.img 4194304M -Formatting 'TEST_DIR/luks-aes-128-xts-plain64-sha256-sha1.img', fmt=3Dluks= size=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-128 cipher-mode=3D= xts ivgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-128-xts-plain64-sha256-sh= a1.img qiotest-145-aes-128-xts-plain64-sha256-sha1 @@ -1142,7 +1133,6 @@ unlink TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.= img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-192-xts= -plain64-sha256-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-192,cipher-m= ode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-aes-192-xts-pla= in64-sha256-sha1.img 4194304M -Formatting 'TEST_DIR/luks-aes-192-xts-plain64-sha256-sha1.img', fmt=3Dluks= size=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-192 cipher-mode=3D= xts ivgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-192-xts-plain64-sha256-sh= a1.img qiotest-145-aes-192-xts-plain64-sha256-sha1 @@ -1262,7 +1252,6 @@ unlink TEST_DIR/luks-twofish-128-xts-plain64-sha1.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img twofish-128= -xts-plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Dtwofish-128,ciph= er-mode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-twofish-128= -xts-plain64-sha1.img 4194304M -Formatting 'TEST_DIR/luks-twofish-128-xts-plain64-sha1.img', fmt=3Dluks si= ze=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dtwofish-128 cipher-mode= =3Dxts ivgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-twofish-128-xts-plain64-sha1.= img qiotest-145-twofish-128-xts-plain64-sha1 @@ -1383,7 +1372,6 @@ unlink TEST_DIR/luks-serpent-128-xts-plain64-sha1.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img serpent-128= -xts-plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Dserpent-128,ciph= er-mode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-serpent-128= -xts-plain64-sha1.img 4194304M -Formatting 'TEST_DIR/luks-serpent-128-xts-plain64-sha1.img', fmt=3Dluks si= ze=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dserpent-128 cipher-mode= =3Dxts ivgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-128-xts-plain64-sha1.= img qiotest-145-serpent-128-xts-plain64-sha1 @@ -1503,7 +1491,6 @@ unlink TEST_DIR/luks-serpent-192-xts-plain64-sha1.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img serpent-192= -xts-plain64-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Dserpent-192,ciph= er-mode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha1 TEST_DIR/luks-serpent-192= -xts-plain64-sha1.img 4194304M -Formatting 'TEST_DIR/luks-serpent-192-xts-plain64-sha1.img', fmt=3Dluks si= ze=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Dserpent-192 cipher-mode= =3Dxts ivgen-alg=3Dplain64 hash-alg=3Dsha1 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-serpent-192-xts-plain64-sha1.= img qiotest-145-serpent-192-xts-plain64-sha1 @@ -1625,7 +1612,6 @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha224.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-xts= -plain64-sha224 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m= ode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha224 TEST_DIR/luks-aes-256-xts-p= lain64-sha224.img 4194304M -Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha224.img', fmt=3Dluks size= =3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dxts i= vgen-alg=3Dplain64 hash-alg=3Dsha224 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha224.im= g qiotest-145-aes-256-xts-plain64-sha224 @@ -1745,7 +1731,6 @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha256.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-xts= -plain64-sha256 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m= ode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha256 TEST_DIR/luks-aes-256-xts-p= lain64-sha256.img 4194304M -Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha256.img', fmt=3Dluks size= =3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dxts i= vgen-alg=3Dplain64 hash-alg=3Dsha256 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha256.im= g qiotest-145-aes-256-xts-plain64-sha256 @@ -1865,7 +1850,6 @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha384.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-xts= -plain64-sha384 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m= ode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha384 TEST_DIR/luks-aes-256-xts-p= lain64-sha384.img 4194304M -Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha384.img', fmt=3Dluks size= =3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dxts i= vgen-alg=3Dplain64 hash-alg=3Dsha384 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha384.im= g qiotest-145-aes-256-xts-plain64-sha384 @@ -1985,7 +1969,6 @@ unlink TEST_DIR/luks-aes-256-xts-plain64-sha512.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-xts= -plain64-sha512 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m= ode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dsha512 TEST_DIR/luks-aes-256-xts-p= lain64-sha512.img 4194304M -Formatting 'TEST_DIR/luks-aes-256-xts-plain64-sha512.img', fmt=3Dluks size= =3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dxts i= vgen-alg=3Dplain64 hash-alg=3Dsha512 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-sha512.im= g qiotest-145-aes-256-xts-plain64-sha512 @@ -2105,7 +2088,6 @@ unlink TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-xts= -plain64-ripemd160 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m= ode=3Dxts,ivgen-alg=3Dplain64,hash-alg=3Dripemd160 TEST_DIR/luks-aes-256-xt= s-plain64-ripemd160.img 4194304M -Formatting 'TEST_DIR/luks-aes-256-xts-plain64-ripemd160.img', fmt=3Dluks s= ize=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dxt= s ivgen-alg=3Dplain64 hash-alg=3Dripemd160 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain64-ripemd160= .img qiotest-145-aes-256-xts-plain64-ripemd160 @@ -2299,7 +2281,6 @@ unlink TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslot= s.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-xts= -plain-sha1-pwallslots =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3Dc2xvdDE=3D,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m= ode=3Dxts,ivgen-alg=3Dplain,hash-alg=3Dsha1 TEST_DIR/luks-aes-256-xts-plain= -sha1-pwallslots.img 4194304M -Formatting 'TEST_DIR/luks-aes-256-xts-plain-sha1-pwallslots.img', fmt=3Dlu= ks size=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode= =3Dxts ivgen-alg=3Dplain hash-alg=3Dsha1 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-xts-plain-sha1-pwalls= lots.img qiotest-145-aes-256-xts-plain-sha1-pwallslots @@ -2419,7 +2400,6 @@ unlink TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-cbc= -essiv-auto-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m= ode=3Dcbc,ivgen-alg=3Dessiv,hash-alg=3Dsha1 TEST_DIR/luks-aes-256-cbc-essiv= -auto-sha1.img 4194304M -Formatting 'TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.img', fmt=3Dluks siz= e=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3Dcbc = ivgen-alg=3Dessiv hash-alg=3Dsha1 iter-time=3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-essiv-auto-sha1.i= mg qiotest-145-aes-256-cbc-essiv-auto-sha1 @@ -2539,7 +2519,6 @@ unlink TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.= img # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D qemu-img aes-256-cbc= -plain64-sha256-sha1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Create image qemu-img create -f luks --object secret,id=3Dsec0,data=3DMTIzNDU2,format= =3Dbase64 -o key-secret=3Dsec0,iter-time=3D10,cipher-alg=3Daes-256,cipher-m= ode=3Dcbc,ivgen-alg=3Dplain64,hash-alg=3Dsha1,ivgen-hash-alg=3Dsha256 TEST_= DIR/luks-aes-256-cbc-plain64-sha256-sha1.img 4194304M -Formatting 'TEST_DIR/luks-aes-256-cbc-plain64-sha256-sha1.img', fmt=3Dluks= size=3D4398046511104 key-secret=3Dsec0 cipher-alg=3Daes-256 cipher-mode=3D= cbc ivgen-alg=3Dplain64 ivgen-hash-alg=3Dsha256 hash-alg=3Dsha1 iter-time= =3D10 =20 # Open dev sudo cryptsetup -q -v luksOpen TEST_DIR/luks-aes-256-cbc-plain64-sha256-sh= a1.img qiotest-145-aes-256-cbc-plain64-sha256-sha1 diff --git a/tests/qemu-iotests/237.out b/tests/qemu-iotests/237.out index aa94986803..fa84ee4597 100644 --- a/tests/qemu-iotests/237.out +++ b/tests/qemu-iotests/237.out @@ -129,11 +129,8 @@ Job failed: Cannot find device=3D'this doesn't exist' = nor node-name=3D'this doesn't =20 =3D=3D=3D Other subformats =3D=3D=3D =20 -Formatting 'TEST_DIR/PID-t.vmdk.1', fmt=3Dvmdk size=3D0 compat6=3Doff hwve= rsion=3Dundefined =20 -Formatting 'TEST_DIR/PID-t.vmdk.2', fmt=3Dvmdk size=3D0 compat6=3Doff hwve= rsion=3Dundefined =20 -Formatting 'TEST_DIR/PID-t.vmdk.3', fmt=3Dvmdk size=3D0 compat6=3Doff hwve= rsion=3Dundefined =20 =3D=3D Missing extent =3D=3D =20 diff --git a/tests/qemu-iotests/255.out b/tests/qemu-iotests/255.out index 33b7f22de3..11a05a5213 100644 --- a/tests/qemu-iotests/255.out +++ b/tests/qemu-iotests/255.out @@ -3,9 +3,7 @@ Finishing a commit job with background reads =20 =3D=3D=3D Create backing chain and start VM =3D=3D=3D =20 -Formatting 'TEST_DIR/PID-t.qcow2.mid', fmt=3Dqcow2 cluster_size=3D65536 ex= tended_l2=3Doff compression_type=3Dzlib size=3D134217728 lazy_refcounts=3Do= ff refcount_bits=3D16 =20 -Formatting 'TEST_DIR/PID-t.qcow2', fmt=3Dqcow2 cluster_size=3D65536 extend= ed_l2=3Doff compression_type=3Dzlib size=3D134217728 lazy_refcounts=3Doff r= efcount_bits=3D16 =20 =3D=3D=3D Start background read requests =3D=3D=3D =20 @@ -23,9 +21,7 @@ Closing the VM while a job is being cancelled =20 =3D=3D=3D Create images and start VM =3D=3D=3D =20 -Formatting 'TEST_DIR/PID-src.qcow2', fmt=3Dqcow2 cluster_size=3D65536 exte= nded_l2=3Doff compression_type=3Dzlib size=3D134217728 lazy_refcounts=3Doff= refcount_bits=3D16 =20 -Formatting 'TEST_DIR/PID-dst.qcow2', fmt=3Dqcow2 cluster_size=3D65536 exte= nded_l2=3Doff compression_type=3Dzlib size=3D134217728 lazy_refcounts=3Doff= refcount_bits=3D16 =20 wrote 1048576/1048576 bytes at offset 0 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) diff --git a/tests/qemu-iotests/274.out b/tests/qemu-iotests/274.out index 16a95a4850..1d2928e14d 100644 --- a/tests/qemu-iotests/274.out +++ b/tests/qemu-iotests/274.out @@ -1,9 +1,6 @@ =3D=3D Commit tests =3D=3D -Formatting 'TEST_DIR/PID-base', fmt=3Dqcow2 cluster_size=3D65536 extended_= l2=3Doff compression_type=3Dzlib size=3D2097152 lazy_refcounts=3Doff refcou= nt_bits=3D16 =20 -Formatting 'TEST_DIR/PID-mid', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D1048576 backing_file=3DTEST_DIR/PID-= base backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 -Formatting 'TEST_DIR/PID-top', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D2097152 backing_file=3DTEST_DIR/PID-= mid backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 wrote 2097152/2097152 bytes at offset 0 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -66,11 +63,8 @@ read 1048576/1048576 bytes at offset 1048576 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 =3D=3D=3D Testing HMP commit (top -> mid) =3D=3D=3D -Formatting 'TEST_DIR/PID-base', fmt=3Dqcow2 cluster_size=3D65536 extended_= l2=3Doff compression_type=3Dzlib size=3D2097152 lazy_refcounts=3Doff refcou= nt_bits=3D16 =20 -Formatting 'TEST_DIR/PID-mid', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D1048576 backing_file=3DTEST_DIR/PID-= base backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 -Formatting 'TEST_DIR/PID-top', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D2097152 backing_file=3DTEST_DIR/PID-= mid backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 wrote 2097152/2097152 bytes at offset 0 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -98,11 +92,8 @@ read 1048576/1048576 bytes at offset 1048576 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 =3D=3D=3D Testing QMP active commit (top -> mid) =3D=3D=3D -Formatting 'TEST_DIR/PID-base', fmt=3Dqcow2 cluster_size=3D65536 extended_= l2=3Doff compression_type=3Dzlib size=3D2097152 lazy_refcounts=3Doff refcou= nt_bits=3D16 =20 -Formatting 'TEST_DIR/PID-mid', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D1048576 backing_file=3DTEST_DIR/PID-= base backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 -Formatting 'TEST_DIR/PID-top', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D2097152 backing_file=3DTEST_DIR/PID-= mid backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 wrote 2097152/2097152 bytes at offset 0 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -136,11 +127,8 @@ read 1048576/1048576 bytes at offset 1048576 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 =3D=3D=3D Testing qemu-img commit (top -> base) =3D=3D=3D -Formatting 'TEST_DIR/PID-base', fmt=3Dqcow2 cluster_size=3D65536 extended_= l2=3Doff compression_type=3Dzlib size=3D2097152 lazy_refcounts=3Doff refcou= nt_bits=3D16 =20 -Formatting 'TEST_DIR/PID-mid', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D1048576 backing_file=3DTEST_DIR/PID-= base backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 -Formatting 'TEST_DIR/PID-top', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D2097152 backing_file=3DTEST_DIR/PID-= mid backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 wrote 2097152/2097152 bytes at offset 0 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -166,11 +154,8 @@ read 1048576/1048576 bytes at offset 1048576 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 =3D=3D=3D Testing QMP active commit (top -> base) =3D=3D=3D -Formatting 'TEST_DIR/PID-base', fmt=3Dqcow2 cluster_size=3D65536 extended_= l2=3Doff compression_type=3Dzlib size=3D2097152 lazy_refcounts=3Doff refcou= nt_bits=3D16 =20 -Formatting 'TEST_DIR/PID-mid', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D1048576 backing_file=3DTEST_DIR/PID-= base backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 -Formatting 'TEST_DIR/PID-top', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D2097152 backing_file=3DTEST_DIR/PID-= mid backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 wrote 2097152/2097152 bytes at offset 0 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -205,9 +190,7 @@ read 1048576/1048576 bytes at offset 1048576 =20 =3D=3D Resize tests =3D=3D =3D=3D=3D preallocation=3Doff =3D=3D=3D -Formatting 'TEST_DIR/PID-base', fmt=3Dqcow2 cluster_size=3D65536 extended_= l2=3Doff compression_type=3Dzlib size=3D6442450944 lazy_refcounts=3Doff ref= count_bits=3D16 =20 -Formatting 'TEST_DIR/PID-top', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D1073741824 backing_file=3DTEST_DIR/P= ID-base backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 wrote 65536/65536 bytes at offset 5368709120 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -224,9 +207,7 @@ read 65536/65536 bytes at offset 5368709120 { "start": 1073741824, "length": 7516192768, "depth": 0, "present": true, = "zero": true, "data": false}] =20 =3D=3D=3D preallocation=3Dmetadata =3D=3D=3D -Formatting 'TEST_DIR/PID-base', fmt=3Dqcow2 cluster_size=3D65536 extended_= l2=3Doff compression_type=3Dzlib size=3D34359738368 lazy_refcounts=3Doff re= fcount_bits=3D16 =20 -Formatting 'TEST_DIR/PID-top', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D32212254720 backing_file=3DTEST_DIR/= PID-base backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 wrote 65536/65536 bytes at offset 33285996544 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -248,9 +229,7 @@ read 65536/65536 bytes at offset 33285996544 { "start": 34896609280, "length": 536870912, "depth": 0, "present": true, = "zero": true, "data": false, "offset": 2685075456}] =20 =3D=3D=3D preallocation=3Dfalloc =3D=3D=3D -Formatting 'TEST_DIR/PID-base', fmt=3Dqcow2 cluster_size=3D65536 extended_= l2=3Doff compression_type=3Dzlib size=3D10485760 lazy_refcounts=3Doff refco= unt_bits=3D16 =20 -Formatting 'TEST_DIR/PID-top', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D5242880 backing_file=3DTEST_DIR/PID-= base backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 wrote 65536/65536 bytes at offset 9437184 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -267,9 +246,7 @@ read 65536/65536 bytes at offset 9437184 { "start": 5242880, "length": 10485760, "depth": 0, "present": true, "zero= ": false, "data": true, "offset": 327680}] =20 =3D=3D=3D preallocation=3Dfull =3D=3D=3D -Formatting 'TEST_DIR/PID-base', fmt=3Dqcow2 cluster_size=3D65536 extended_= l2=3Doff compression_type=3Dzlib size=3D16777216 lazy_refcounts=3Doff refco= unt_bits=3D16 =20 -Formatting 'TEST_DIR/PID-top', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D8388608 backing_file=3DTEST_DIR/PID-= base backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 wrote 65536/65536 bytes at offset 11534336 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -286,9 +263,7 @@ read 65536/65536 bytes at offset 11534336 { "start": 8388608, "length": 4194304, "depth": 0, "present": true, "zero"= : false, "data": true, "offset": 327680}] =20 =3D=3D=3D preallocation=3Doff =3D=3D=3D -Formatting 'TEST_DIR/PID-base', fmt=3Dqcow2 cluster_size=3D65536 extended_= l2=3Doff compression_type=3Dzlib size=3D393216 lazy_refcounts=3Doff refcoun= t_bits=3D16 =20 -Formatting 'TEST_DIR/PID-top', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D259072 backing_file=3DTEST_DIR/PID-b= ase backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 wrote 65536/65536 bytes at offset 259072 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -306,9 +281,7 @@ read 65536/65536 bytes at offset 259072 { "start": 262144, "length": 262144, "depth": 0, "present": true, "zero": = true, "data": false}] =20 =3D=3D=3D preallocation=3Doff =3D=3D=3D -Formatting 'TEST_DIR/PID-base', fmt=3Dqcow2 cluster_size=3D65536 extended_= l2=3Doff compression_type=3Dzlib size=3D409600 lazy_refcounts=3Doff refcoun= t_bits=3D16 =20 -Formatting 'TEST_DIR/PID-top', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D262144 backing_file=3DTEST_DIR/PID-b= ase backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 wrote 65536/65536 bytes at offset 344064 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -325,9 +298,7 @@ read 65536/65536 bytes at offset 344064 { "start": 262144, "length": 262144, "depth": 0, "present": true, "zero": = true, "data": false}] =20 =3D=3D=3D preallocation=3Doff =3D=3D=3D -Formatting 'TEST_DIR/PID-base', fmt=3Dqcow2 cluster_size=3D65536 extended_= l2=3Doff compression_type=3Dzlib size=3D524288 lazy_refcounts=3Doff refcoun= t_bits=3D16 =20 -Formatting 'TEST_DIR/PID-top', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D262144 backing_file=3DTEST_DIR/PID-b= ase backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 =20 wrote 65536/65536 bytes at offset 446464 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) diff --git a/tests/qemu-iotests/280.out b/tests/qemu-iotests/280.out index 09a0f1a7cb..e39164c579 100644 --- a/tests/qemu-iotests/280.out +++ b/tests/qemu-iotests/280.out @@ -1,4 +1,3 @@ -Formatting 'TEST_DIR/PID-base', fmt=3Dqcow2 cluster_size=3D65536 extended_= l2=3Doff compression_type=3Dzlib size=3D67108864 lazy_refcounts=3Doff refco= unt_bits=3D16 =20 =3D=3D=3D Launch VM =3D=3D=3D Enabling migration QMP events on VM... diff --git a/tests/qemu-iotests/296.out b/tests/qemu-iotests/296.out index 6c69735604..42205cc981 100644 --- a/tests/qemu-iotests/296.out +++ b/tests/qemu-iotests/296.out @@ -1,4 +1,3 @@ -Formatting 'TEST_DIR/test.img', fmt=3Dluks size=3D1048576 key-secret=3Dkey= sec0 iter-time=3D10 =20 {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -13,8 +12,7 @@ Job failed: Failed to get shared "consistent read" lock qemu-img: Failed to get shared "consistent read" lock Is another process using the image [TEST_DIR/test.img]? =20 -.Formatting 'TEST_DIR/test.img', fmt=3Dluks size=3D1048576 key-secret=3Dke= ysec0 iter-time=3D10 - +. Job failed: Block node is read-only {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} @@ -26,12 +24,10 @@ Job failed: Failed to get shared "consistent read" lock {"return": {}} {"execute": "job-dismiss", "arguments": {"id": "job0"}} {"return": {}} -.Formatting 'TEST_DIR/test.img', fmt=3Dluks size=3D1048576 key-secret=3Dke= ysec0 iter-time=3D10 - +. {"return": {}} {"error": {"class": "GenericError", "desc": "Failed to get \"write\" lock"= }} -.Formatting 'TEST_DIR/test.img', fmt=3Dluks size=3D1048576 key-secret=3Dke= ysec0 iter-time=3D10 - +. {"return": {}} {"return": {}} . diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index a838737c28..0ff9e87510 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -126,7 +126,9 @@ def unarchive_sample_image(sample, fname): =20 =20 def qemu_tool_pipe_and_status(tool: str, args: Sequence[str], - connect_stderr: bool =3D True) -> Tuple[str,= int]: + connect_stderr: bool =3D True, + drop_successful_output: bool =3D False) \ + -> Tuple[str, int]: """ Run a tool and return both its output and its exit code """ @@ -138,6 +140,8 @@ def qemu_tool_pipe_and_status(tool: str, args: Sequence= [str], cmd =3D ' '.join(args) sys.stderr.write(f'{tool} received signal \ {-subp.returncode}: {cmd}\n') + if drop_successful_output and subp.returncode =3D=3D 0: + output =3D '' return (output, subp.returncode) =20 def qemu_img_create_prepare_args(args: List[str]) -> List[str]: @@ -182,8 +186,10 @@ def qemu_img_pipe_and_status(*args: str) -> Tuple[str,= int]: """ Run qemu-img and return both its output and its exit code """ + is_create =3D bool(args and args[0] =3D=3D 'create') full_args =3D qemu_img_args + qemu_img_create_prepare_args(list(args)) - return qemu_tool_pipe_and_status('qemu-img', full_args) + return qemu_tool_pipe_and_status('qemu-img', full_args, + drop_successful_output=3Dis_create) =20 def qemu_img(*args: str) -> int: '''Run qemu-img and return the exit code''' --=20 2.29.2 From nobody Thu Apr 25 01:48:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631615802; cv=pass; d=zohomail.com; s=zohoarc; b=nsuSRnndSfMVLM7Adn2q7cOnHd+hBIyFXS4CnolWSPwD+0tEIGqlyeeVyULs1sSHIEzB6mDus82F5FwDFkAg6fgop96I2ZiIvqujHHMgE+EmYVmjvsZ/NVp3N2+A0xyCWxNtN3Pz8Ey1o7/r1KE8qjlZd7h1cOGsIJCGR26VLbQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631615802; h=Content-Type: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:References:Sender:Subject:To; bh=3ckk487bHh78KNfFinCAGa/VaCSDe/X2bpCZZCwwW8E=; b=aWjV5PITa7ZmWSVd9tHBuD4qjvZG0wggPi13VQTWdrtmtBsIlXasFPI+4VfB77ivcwVupVjLUBwDnSJL2nPCkNjkubkBjZm5dGnCf3zThVMgVaUdn4DhVsjcYOo1apZxpTra8dYxPWHjemD5rgM6RBP7LGxA6b3J33vXyHHPcUg= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16316158023861003.7276918992178; Tue, 14 Sep 2021 03:36:42 -0700 (PDT) Received: from localhost ([::1]:45652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5nt-0005qH-8t for importer@patchew.org; Tue, 14 Sep 2021 06:36:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5dx-0004g0-6r; Tue, 14 Sep 2021 06:26:25 -0400 Received: from mail-db8eur05on2115.outbound.protection.outlook.com ([40.107.20.115]:20224 helo=EUR05-DB8-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 1mQ5dt-0003Ok-SI; Tue, 14 Sep 2021 06:26:24 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6071.eurprd08.prod.outlook.com (2603:10a6:20b:29f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Tue, 14 Sep 2021 10:26:15 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:15 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XiMfwo9/uj7O6d0J7lrE3ti9GPH3K6WV5vvrTS7snwRBiwLAAWyvSYpe/7ml1xJD4me4gykXy2w3p2KB7XVTCqR0c9FP+rPmhcu3cU8IHtb24rDTQ6dpF0jfJpkucWsJq3CZQdLk+qu2QBRG6/8647bn05dQgv1EOxyvK9Dnb5+Bx7G2lXgcKbaCcIcCEssR4eoQK0wEdrY4FouqX5deGR+3txgEOO5W/a4aZB0GUFpjYO3/YGg6g0QIzBRqpHcoHwyVN9PW6HpmC81vJsHlL/OA27ury/oiUHchkjtKwUaI8RdKmyRXbIpJAdeVQJ6cmhnZHvIp6j3GWsGIXc+Qxg== 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; bh=3ckk487bHh78KNfFinCAGa/VaCSDe/X2bpCZZCwwW8E=; b=Dsb2IsoY0Dx12iYcAkinS8LGa5aijpkmicr+X/x8Q8OP7CEj1xD5ENMF2u1OyJLmXiPc4Hutjh69il9EIDZXFDUjIR46EgPCog59WVSFls7oMlGoBzzyN6/A4tN8neUGMZVn2LOZC0y3T8/oBsOuzvRmiU6m7Pr6uh0qHStdj/YeWfijj3sXgQREcbTIBbOAtUcr1ZdPKln6zwT5mEXwoFEbuZ18CciRrrrXmDZHzejzAPOAnHqA2wx2JvJ00j6vBUgLHhUpcpcdOktQqFgEARRvLdW79RRESTn5S+484WPJ/NHpRgbK2f9xMrtR6EXjjlStCapmvVhxsFuwoAr54w== 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=3ckk487bHh78KNfFinCAGa/VaCSDe/X2bpCZZCwwW8E=; b=cO7FhF+4hK71EC31UEeSVRJj18KCIQmo5EyxNaUCBad/T3JK2U0ZW3BObSZDM/qkIUjCMMmNIl/LkA+uoGwTDBsJcrEyluIcBUE3a+8QOXSAue60noE3lOAg3nfQd/XRgKyA/KfaOljIUF3gt7heyss24l/tChanKJVwie+ulv8= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com Subject: [PATCH v3 08/17] iotests.py: filter compression type out Date: Tue, 14 Sep 2021 13:25:38 +0300 Message-Id: <20210914102547.83963-9-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e1d933c7-a1f5-4bfa-807d-08d9776a14df X-MS-TrafficTypeDiagnostic: AS8PR08MB6071: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 44weQ2X9xtwr/yur61mXYmTyIs+IZjqs7RdMpVyR8noui/9P3xfcS175rIxEETS8jaRXo1Svw4Cpov/wYGOimvZGDO1D4wc8xeBV3zH8e0GwgL9/gq9vY5JIFCUPSlNz8+2k2KrVqHo5syN1lr3D8ER9MPrkb2urvHAinb3fuRxW3wfXAER8lU3wbXoYKDl8+2TXoAiPYjeVO4vK8TdiiZnpYhAonuN6rmXyW6qKmT8cGuWKDkYOwX4wWA/jaqU+8jQW3wpyLGPI5JibowG3ISMWAGQH/xh/cj+uf4KCcCzBBCfq1LMby24ZtD5UAjfa3jrMLjsBtptovmSWxb+UOZePShNcK3fTKUVltok9nPN8Qk2/RwpCd19bTVp+fhwn5+iLBx9Mn9mA6LEvVMJlxOOlTUiPO4ImbTm1tTQ2BDJ58unXddIScSPN3h81U2tBwLbGGIm3AHReuEFjXwylIioi9y1yz0xoUdGgbEqcuRhENPVfz4zosBuqFmKHDRB8SG+X6yjjF0ivcd6tavfBRvxVsSZgDJiIQCmsqYnMlZ5V8zGbMNtfgnCNDZSnRaFq7iAPYlTS2Jb4VnpD97ieKZdwodn2Uum+zfFYZ2U0Wm6SudDCMdB/0FZ7Ml0wiqbawbAMXIuLft+nak5geuRVhdXjYSN0GIU0C8jg5PRMD6iLOaM3+3FtfulMlofaz2xL X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39840400004)(366004)(136003)(396003)(6486002)(26005)(86362001)(2906002)(6666004)(38350700002)(66476007)(38100700002)(66946007)(478600001)(8676002)(36756003)(956004)(66556008)(1076003)(186003)(6506007)(6512007)(6916009)(83380400001)(5660300002)(2616005)(8936002)(4326008)(316002)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bmxTcHNajMFSWS8hAX9z8BdlchsdyzESkuuO/6vUTrluzFziLit0qzcymHML?= =?us-ascii?Q?OwnKkZZRXZdshSbok1G9aIhs/Te+RJr4pwOTCVJ/3CTUgu4UXlTniqSvQPoe?= =?us-ascii?Q?M2FV72IJAOXv/cy3jFdAxHwU/EqSBmcmks91THkeIb5KmY1ulcHCXwWAi0qL?= =?us-ascii?Q?1q5lqtnlrInLnRKnxBMPns1kRiRURIaRMHzL8LHL36rykrXU4OuJwqdRx1LU?= =?us-ascii?Q?EnA/iztkhMkYFMKjKkj7Kauoxs5gdE8mUPBt7IACazNGVzHu1fGL6m6Hm4FM?= =?us-ascii?Q?k/uH2cpns/LsmRNwDifwUjEpzxz4qNUfTnxx3vT5/xhda4mRxXzYyCvRAEPq?= =?us-ascii?Q?mDIrfMUbBBAaZwoJMoL1gY/e4VvK47K/VMi2jM2p6tjOrgbd93WGtDg7H4DC?= =?us-ascii?Q?qtveWNXSQBjMLkL7RBem09TVR4a83Kvl8rAF4JOXPUDwAdq9qcdgYAApkiaI?= =?us-ascii?Q?EoAHWycJkVciDVcdxvj+qz/V1dTCIpxD2UE6l3OuvOVVsB5957sGmVioD5A/?= =?us-ascii?Q?xMSSYB0irzDq4KJdEQspT1UXSMrb51vAFW/HSINcGfjauans6UwyXn+e8gAB?= =?us-ascii?Q?jNDE1vUaRBZNiXhgAadzu7ln/MZZzMFYY5YR5WaRkfFbyQWFBebB0fvJP8Hm?= =?us-ascii?Q?e8v3KrxV0O8FhYAc0jgbo8R3EXlHpoVvKcMKkWlFZt2VP7jJUdP8CBnWXrhp?= =?us-ascii?Q?+t3+LNv2k8vjGf0HUwy1AhJgRCVjZ03BwxjPNfJUQF34mA7UlyPrDdyZBcci?= =?us-ascii?Q?NbYutjJvwNAlIVzvfBTqKpHQiKI0e7uMomRFHBoFbTroahuT4z9EzSmPuJhw?= =?us-ascii?Q?UX0ZqH4nfgbN91bGWemreGfufOsxpu0MKq/UAPrrTC7Mf9MQxUa6CDl89avG?= =?us-ascii?Q?NrtgKmJWGEL37G55DexEuBFID2uAsKqcxcDt2wtj9rokvn/CYQJkYmG53IxS?= =?us-ascii?Q?5GKZKOdRk51G0rq/F/nhgKSFtMebhPUeWJzVkEwk5NFhYmXNuS9LZOJDJ7qt?= =?us-ascii?Q?LxPG6DXvxb4OxToWUICBppJMz8AIIcQ+FybazmxZmkQUAw/UGDq62Or3WGGW?= =?us-ascii?Q?tTZ+N/w9gpJ8X951lRTUTzNl4dJIO2U66kpcnYU2jppkyPrj4CRhP2pNGoaX?= =?us-ascii?Q?I89A9Mn6Yf2bseDcMmzMlDUjaEWheihgsdwPsMatpmRrToT3IrueG7vdqQnM?= =?us-ascii?Q?cVcwgWR6dD1QNEZcarGYbGOiIeydbrixNI6E7JIodDHhF5jAQYOQSJ3xevji?= =?us-ascii?Q?cR8O1Xd72iFbyWp/K1c09dxZI7exKg5Tv/5/CIVaRzzN6w8KPy5cyJ1jwwQI?= =?us-ascii?Q?vCJrFYmVB6yk/BiUS33gue8j?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1d933c7-a1f5-4bfa-807d-08d9776a14df X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:15.1529 (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: ur/shpd2xKHACDX6R+WscKelLtgy9TSEpy37L5u+XMq8nZmFtrCEosM2TdrmLB4Q0CqdBEi2RnvjLVa5aWmOZIPwV5uu8wT12POAoO4qVpc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6071 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.20.115; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631615802890100001 Content-Type: text/plain; charset="utf-8" We want iotests pass with both the default zlib compression and with IMGOPTS=3D'compression_type=3Dzstd'. Actually the only test that is interested in real compression type in test output is 287 (test for qcow2 compression type) and it's in bash. So for now we can safely filter out compression type in all qcow2 tests. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Hanna Reitz --- tests/qemu-iotests/206.out | 10 +++++----- tests/qemu-iotests/242.out | 10 +++++----- tests/qemu-iotests/274.out | 10 +++++----- tests/qemu-iotests/iotests.py | 2 ++ 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/tests/qemu-iotests/206.out b/tests/qemu-iotests/206.out index b68c443867..253209eca9 100644 --- a/tests/qemu-iotests/206.out +++ b/tests/qemu-iotests/206.out @@ -18,7 +18,7 @@ virtual size: 128 MiB (134217728 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 corrupt: false @@ -42,7 +42,7 @@ virtual size: 64 MiB (67108864 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 corrupt: false @@ -66,7 +66,7 @@ virtual size: 32 MiB (33554432 bytes) cluster_size: 2097152 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: true refcount bits: 1 corrupt: false @@ -92,7 +92,7 @@ backing file: TEST_IMG.base backing file format: IMGFMT Format specific information: compat: 0.10 - compression type: zlib + compression type: COMPRESSION_TYPE refcount bits: 16 =20 =3D=3D=3D Successful image creation (encrypted) =3D=3D=3D @@ -109,7 +109,7 @@ encrypted: yes cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 encrypt: diff --git a/tests/qemu-iotests/242.out b/tests/qemu-iotests/242.out index 3759c99284..ce231424a7 100644 --- a/tests/qemu-iotests/242.out +++ b/tests/qemu-iotests/242.out @@ -12,7 +12,7 @@ virtual size: 1 MiB (1048576 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 corrupt: false @@ -34,7 +34,7 @@ virtual size: 1 MiB (1048576 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false bitmaps: [0]: @@ -68,7 +68,7 @@ virtual size: 1 MiB (1048576 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false bitmaps: [0]: @@ -110,7 +110,7 @@ virtual size: 1 MiB (1048576 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false bitmaps: [0]: @@ -161,7 +161,7 @@ virtual size: 1 MiB (1048576 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false bitmaps: [0]: diff --git a/tests/qemu-iotests/274.out b/tests/qemu-iotests/274.out index 1d2928e14d..1ce40d839a 100644 --- a/tests/qemu-iotests/274.out +++ b/tests/qemu-iotests/274.out @@ -50,7 +50,7 @@ backing file: TEST_DIR/PID-base backing file format: IMGFMT Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 corrupt: false @@ -79,7 +79,7 @@ backing file: TEST_DIR/PID-base backing file format: IMGFMT Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 corrupt: false @@ -114,7 +114,7 @@ backing file: TEST_DIR/PID-base backing file format: IMGFMT Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 corrupt: false @@ -141,7 +141,7 @@ virtual size: 2 MiB (2097152 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 corrupt: false @@ -176,7 +176,7 @@ backing file: TEST_DIR/PID-base backing file format: IMGFMT Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 corrupt: false diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 0ff9e87510..d9a764404e 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -472,6 +472,8 @@ def filter_img_info(output, filename): 'uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', line) line =3D re.sub('cid: [0-9]+', 'cid: XXXXXXXXXX', line) + line =3D re.sub('(compression type: )(zlib|zstd)', r'\1COMPRESSION= _TYPE', + line) lines.append(line) return '\n'.join(lines) =20 --=20 2.29.2 From nobody Thu Apr 25 01:48:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631615804; cv=pass; d=zohomail.com; s=zohoarc; b=LZRmrSsYDrjerR/3xVhBtzFFeNwlP8H49gRosADUfQK2ZOT2U6lKQMooK/6uVhX5s25lYq3wNkNoDgRJPOjZne4GqSlLBWxdk0sIpOMG6OM+p+FS31EveBuZmSaOOzU/rXQSHgWMD8eHWR2ZZ2I9OuWANcecUbobWb9XK73qZtY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631615804; h=Content-Type: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:References:Sender:Subject:To; bh=jG2ggPQVmfAAMk4zmRJKA5ti4bwdu8H5a2BGZYFPCiQ=; b=GeIGXZqFQhiGebmqnsNBfbmBirXf/WoOKUMcJcZ1Dj3HIe592rQTuPEplgDrebuoW3fMD0gLK4/KvCYMdjMj0FgcxoIXZA+r8+ODI9l3xT064P/pZ83uro/gyqFgmYGHVlvsCGkTsFS70AtPqPR6spa+qffWPevmGrxE721JD78= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631615804314641.8529783734066; Tue, 14 Sep 2021 03:36:44 -0700 (PDT) Received: from localhost ([::1]:45638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5nv-0005ph-6q for importer@patchew.org; Tue, 14 Sep 2021 06:36:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5dz-0004ou-PL; Tue, 14 Sep 2021 06:26:27 -0400 Received: from mail-db8eur05on2115.outbound.protection.outlook.com ([40.107.20.115]:20224 helo=EUR05-DB8-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 1mQ5dx-0003Ok-SE; Tue, 14 Sep 2021 06:26:27 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6071.eurprd08.prod.outlook.com (2603:10a6:20b:29f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Tue, 14 Sep 2021 10:26:16 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:16 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WyRrgV4XBTFlJ55DJj7tm87+UdZbNVqqfU3Pt5kgFS+3CGJuK7LL/l+78H3MGBpmEdQXfh9zB0G6p9O0dJx2bbFCcnNcItxXpptbCE877txGgGG7hJujOR713zCb0MDJgwfDLsV/fZxCPFtDIVBvfGG7CgFyoQlFDzR/+ciJMm1uJUH0r4lY8FTI1+n7/icv5zw+n13q+g7gg/91dFthTpOFsSaetPV8cCUOiagaE/+7eS0SqJ/4PjvkY8Xt0ahTOYQhqfjGd3JeRWZznyN0prextEN5rTjMVJdNf3+qX7qxFhTRhyxCloH8vc48SInNuMUcO6c3kLK9mUGCEgdZBg== 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; bh=jG2ggPQVmfAAMk4zmRJKA5ti4bwdu8H5a2BGZYFPCiQ=; b=n+/sLm+w8kTbQWe9l0QWaDhMQwcxihkSbxR7LA7mjitV35Jmjl3ZaGClBo2Ta88kRwdfcm0n+Z1kp4h0DLQEr5JG3jzBCRxPoiKLgXdCMTbIcyjgKwFLUb1E7t0URdSHns0Dp6xyeXH6mJU9e0lfoFLN+ql19sPvMDzZy7CEFOkr2Bk6My7UWOETqhoOW1Lo7v2QPD4EaaodrR/i12UidWfh4QEL5aV4LUNVZuU3VC0zMN81jn+0CJCqexZVW9kqJ+Au4HFICMhiLD0fpqGDXj9G5wrQREV5f+Qp7Ly7JywMdP5EPYCdIDpiZ5qol+z5f8L/jEeFw1RmQTqI+eZ3gA== 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=jG2ggPQVmfAAMk4zmRJKA5ti4bwdu8H5a2BGZYFPCiQ=; b=bGY5WGFJPVJzLftm3YOhgYc6OWHpXvDRB5kWB/Koj4+PofprL3AzqAami2edYhx3F8bCkABiAQAv8/dZ65eQWFUS+yHFtMts3zaEg+wbhrG/2J89AFg10UfweKgRJtAcQL5Gy6AeUMQaLBRecpluQUS8vt6JIhdTv6wRPuXil+8= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, Max Reitz Subject: [PATCH v3 09/17] iotest 302: use img_info_log() helper Date: Tue, 14 Sep 2021 13:25:39 +0300 Message-Id: <20210914102547.83963-10-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1b41318f-963c-4f15-93d3-08d9776a1583 X-MS-TrafficTypeDiagnostic: AS8PR08MB6071: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vD7RSstkpvQYeldwM9Rbc6E2GvFhJW/Un51iGnzJuhTfHp33qASLoWNYn4Xg+aN2tTSuFjcoj4JcuT9xwwa5OLV9eNxzOh1ABVTP67cmCpxgpoE2Twbf42rDTri+2ytTeeL+aSO9ImXxbHRv7if8/JGr+Eibt+piLLwXhMjJUs9DzDup505GjeC0IafoIH8g4dqNPdxc9hQJtMARQWTkEeXbt97hM70j6YIKp26cCVgBSR+FSmfKJAhW5RjVncUKuat5SY0ORI6zVONzVqd1BLFSJvCx3iCn0EuHf3HIFjHk33kgtrHcKwq/V5UGBfNYtpWnx9F7KZQSGm0MefocoDvch4iJmJ2NbFAhBsE8w9EBkgFTgS7Wsf96825TrWtz9/6oF8KXrPF4coKFSiN3IvjkfNTfOtAPdYCzE8SZkbZ2uSm0jxJNMfn8MSmgX1r2E70X1N26x2laOGC6kcjHearX2JXo9C57EepJcBVJHVgNUnBvIq9VFZolRlobUvgR6naIClHKcB0eCUg+N2rNYwX8KunXTfSsUMWgBrbzDGRlYvR8uXDWjjoUD18BjeHS/3pnLRW0/tDVXedufxryB9/elQotSr3c0pbWNvK+Pb1jVhsXz8eTQ0fXRwT/kOnOKDQoB1PBjTChKrari0PQLwgdGlJBViGYmqJM/ZIPJ9cCfFhS97xfziBe7gQDaaujebEr+wfJrEnR7ZAmbY0sUg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39840400004)(366004)(136003)(396003)(6486002)(26005)(86362001)(2906002)(6666004)(38350700002)(66476007)(38100700002)(66946007)(478600001)(8676002)(36756003)(956004)(66556008)(1076003)(186003)(6506007)(6512007)(6916009)(83380400001)(5660300002)(2616005)(8936002)(4326008)(316002)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?95n7jOvVVy3E8cbTIogcBRm//jYP6q6jVL2mYxSlmUW89ZjeE/8HMF3w2l9E?= =?us-ascii?Q?xZp2FPwR0cUS6lJw/+tpfQMZzCcc5/gtHUewbL17p2P6coFxYpzBQZstg+qi?= =?us-ascii?Q?iD2tbypaxOcgaTRotM1qckHNEWCfUI0tzlViUXUBJBf6hj3NFlgB+Km7XCqB?= =?us-ascii?Q?dkF/rEO4gky/U+boQTto8lkjAXQAi3o70IRjLHn8jGzmxwHNwCaQDXqhxqBF?= =?us-ascii?Q?/63iIXoO3Okufc781o2liuI2wZDA5Z82JST538xwLiJivzNANQWr8C8JHs19?= =?us-ascii?Q?ReDrjFT+/rr7FKUIGg6tZQYkoz/1+sMctaCJBWoaWkc3q/8WNXrnrL0igbuk?= =?us-ascii?Q?0YnVwkP0zAyBeRQHmoV/twN+y2oyYa53hFVOM0H7fcMVYbKOhA8JCguWQ8Kf?= =?us-ascii?Q?Cb9V2CNTqLkv1l52G+jfJrNs4rXorHCHdfy/wlR6h8wgdKjec1z2IrHtOS3o?= =?us-ascii?Q?gBhNg/SQDr7HhWX2uN/TuptZul60Id6+HhorAJJ485r78qPe6qVUNS+UYHEW?= =?us-ascii?Q?/UQ2n2LHzATitcpXJU6QufFECH1R5/LdiHQJ4tsUQS9E3Fhpu7xSAsmVPrPv?= =?us-ascii?Q?HsvBRX0qP13athuzIrWgsQCBkgDOFDI2PZ8LK0xnwN7zOM4wKOwIfmfBNAu/?= =?us-ascii?Q?6aHtnAXnInde8o+bEBbSO0g6jv8KGNCzguIjOB3Xp8N8FNpMQWg8ykndmCDc?= =?us-ascii?Q?Q3ED9JILcVGL++oXdWUd8OGZVbxyk+ZGeAiYPpfl5LD578A4we2wfyXeRJe7?= =?us-ascii?Q?haxDUF4HEJWgLLrOPK9ifSeruXc2vy90xhmWRMAL/4kzKYMYVUC0KULI3LEP?= =?us-ascii?Q?KNPKFuh53L+7Q7GthcAYxbA0B5fBvUFtGct0Wx1UF4XbsDQB3zjqiTgaa4mp?= =?us-ascii?Q?FBVCKbDUQez2pRHPJHl2INuFheK3wvz4J9c4V6ZT5ITuT1TEcjeFORWIg8PO?= =?us-ascii?Q?XuNdmyg/VeuYGvYVuQFstsZc6oupfrhOGMHFdYJpqxr1IOIQ/d9Spxcaawhl?= =?us-ascii?Q?Du4em/Ij9xanoawDKLbzCcF9HQRRTQY3O3LPAn5Dj32A1TmgwTH1yk49U5Cc?= =?us-ascii?Q?yqDvtmwXCtc/nhc5F8bI7ozabNR49y4sVX6GJhylDX8tfsIASaBJ2XNf6Ve9?= =?us-ascii?Q?XECoImU7eFuq7qSjwKaNQ/029aNlPVJu6YQ0LNHPIMFlvoM5lxzmvXySab8v?= =?us-ascii?Q?88cE0kBuVPweWBmIW1PuVqwJUab34fsUeYxey650fnFIdPw8JKWuOmu065k0?= =?us-ascii?Q?kxVvVavId8Vl8USznG0KI5EaBp1mGnqOfWWMDL/LkjLwTeWq8zQM3bWcJe5m?= =?us-ascii?Q?kjITgx73rGjbu2NxXnSXas3j?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1b41318f-963c-4f15-93d3-08d9776a1583 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:16.2332 (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: +VEVQIMHkYz7PwwxeG83wIt9lxzVwDF6UKBct65uk2C7VlNYjP1xFL5KU+SbOL1OxuXNueRcjb1nvCnvFn1rREYEL6ZqaICom6F5Ku2xVDA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6071 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.20.115; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631615805008100001 Content-Type: text/plain; charset="utf-8" Instead of qemu_img_log("info", ..) use generic helper img_info_log(). img_info_log() has smarter logic. For example it use filter_img_info() to filter output, which in turns filter a compression type. So it will help us in future when we implement a possibility to use zstd compression by default (with help of some runtime config file or maybe build option). For now to test you should recompile qemu with a small addition into block/qcow2.c before "if (qcow2_opts->has_compression_type": if (!qcow2_opts->has_compression_type && version >=3D 3) { qcow2_opts->has_compression_type =3D true; qcow2_opts->compression_type =3D QCOW2_COMPRESSION_TYPE_ZSTD; } Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/302 | 4 +++- tests/qemu-iotests/302.out | 7 +++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/302 b/tests/qemu-iotests/302 index 5695af4914..a6d79e727b 100755 --- a/tests/qemu-iotests/302 +++ b/tests/qemu-iotests/302 @@ -34,6 +34,7 @@ from iotests import ( qemu_img_measure, qemu_io, qemu_nbd_popen, + img_info_log, ) =20 iotests.script_initialize(supported_fmts=3D["qcow2"]) @@ -88,6 +89,7 @@ with tarfile.open(tar_file, "w") as tar: tar_file): =20 iotests.log("=3D=3D=3D Target image info =3D=3D=3D") + # Not img_info_log as it enforces imgfmt, but now we print info on= raw qemu_img_log("info", nbd_uri) =20 qemu_img( @@ -99,7 +101,7 @@ with tarfile.open(tar_file, "w") as tar: nbd_uri) =20 iotests.log("=3D=3D=3D Converted image info =3D=3D=3D") - qemu_img_log("info", nbd_uri) + img_info_log(nbd_uri) =20 iotests.log("=3D=3D=3D Converted image check =3D=3D=3D") qemu_img_log("check", nbd_uri) diff --git a/tests/qemu-iotests/302.out b/tests/qemu-iotests/302.out index e2f6077e83..3e7c281b91 100644 --- a/tests/qemu-iotests/302.out +++ b/tests/qemu-iotests/302.out @@ -6,14 +6,13 @@ virtual size: 448 KiB (458752 bytes) disk size: unavailable =20 =3D=3D=3D Converted image info =3D=3D=3D -image: nbd+unix:///exp?socket=3DSOCK_DIR/PID-nbd-sock -file format: qcow2 +image: TEST_IMG +file format: IMGFMT virtual size: 1 GiB (1073741824 bytes) -disk size: unavailable cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 corrupt: false --=20 2.29.2 From nobody Thu Apr 25 01:48:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631615938; cv=pass; d=zohomail.com; s=zohoarc; b=faYbdcczLEc/7VrNEaNgoU6jvdNTy/0g/SSZ/aYff2l09NKrJSnLaAuZVGONF1E/r+qusQiwI7fbnglK1Fq3Zqrp4FBi7uQeAnU5ekcF+rzEmc7/Aa8vzly9vry1oKRuK9Do/Gn1l1AorLZbuU640B4jpefqoM6QlMC2ENH8fAI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631615938; h=Content-Type: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:References:Sender:Subject:To; bh=Jli+GD9A24jlE3s8WTSFyIu7FrhAimoplmvans/jOLQ=; b=m9D0MJ77TlrnM4BgdiX5QepPHU0Zx1K+PmitSCLNMWMJpU1UndvhEamRSH5Pb8ZpYIsHBsBBZpU5qa/izG62ACZo4PVMdQz7MvoyPNN5oADNIWvdfRQ0f9/MNI1OaG6CZGgckycH5qIbikSwMuqtDtN3lMEMLibiKy1n7w3k/xk= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631615938638324.3289080477658; Tue, 14 Sep 2021 03:38:58 -0700 (PDT) Received: from localhost ([::1]:53198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5q5-0002Rw-C3 for importer@patchew.org; Tue, 14 Sep 2021 06:38:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5e2-000503-Rw; Tue, 14 Sep 2021 06:26:30 -0400 Received: from mail-db8eur05on2115.outbound.protection.outlook.com ([40.107.20.115]:20224 helo=EUR05-DB8-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 1mQ5e0-0003Ok-E7; Tue, 14 Sep 2021 06:26:30 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6071.eurprd08.prod.outlook.com (2603:10a6:20b:29f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Tue, 14 Sep 2021 10:26:17 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:17 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bA4jkPVWrqvuaw8ZXd05+4g0kFLOcnGd/fSmVhrJJSyLK0bG5ubmbKRDanYhYgQ2or6k+Knm38FJUQXJ1SZGnYl4QCPG+bdkVFlIE9Xt2HkTth9/1kBJkMgay61DuYsKPT0H1Xv5ccZKVE95dQvFv/vk0xzzTZXqcFpmdTGWOU170miRAwGpSfswYApELM1fKp2JMYsrBs85wzRo4gW1fkuPfx7YYJ/9TlGDdTcWjYl+0/p3yR1250SSg31bdhCIxtFrZv7160SOEVkV3nYVsDGJWvZnyovlb2mqLfpEFEuswQ5agDcPOLx0PQ0avjB+JicSaJ5/w7GMoCo5SV3JCw== 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; bh=Jli+GD9A24jlE3s8WTSFyIu7FrhAimoplmvans/jOLQ=; b=Ury+d/QEhKibqj4haGDsjG16ye08F4rIRHkirP6QJe5vNZF21pnEIi8eSxl79b8tkaqByeF4Zc4E1KBBuoToqpe8ld3YWaWGSb4OtQSuK2kGvVseGzxrxPLW7H3VwPxlFhvtLs+4E5A2X2cg/939j8cDZmw4KAohoK8z+fJzv7QoGkIFcLyhuLboyKwnrUSxv2zZ9BgmDMMEMulLX3m/sp9j+QxlepAjw8ebgh0RGFM+W5+yf5TonM5JYU2pamrx+cAzGK6XuMMhVeSID5Yjvw1IcJLLEemQjkHXZOl54zqmzuz2F2BHWjqUgqNs+wJGUIWoimDxCMJ0ESSyIKroeg== 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=Jli+GD9A24jlE3s8WTSFyIu7FrhAimoplmvans/jOLQ=; b=F6nggO2A/GwqTZmimL0ijvLQ9dgULyuTN2g6ttrcC099rBFQY7Ef9o7/iM4r4AbbNoF9w4614wHgNSRPdFA9H+Id51hShPjUmBndfzw0OhEHA559/gkcC1ABXJIAQtgcDOb7PyYtDYnoUCpAkwPGHv+MYGnGIrzbgeuXoJQnQrA= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, Max Reitz Subject: [PATCH v3 10/17] qcow2: simple case support for downgrading of qcow2 images with zstd Date: Tue, 14 Sep 2021 13:25:40 +0300 Message-Id: <20210914102547.83963-11-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7f359ae2-12eb-4292-6031-08d9776a1631 X-MS-TrafficTypeDiagnostic: AS8PR08MB6071: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1247; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dvmkczk9ogkcg3RWLhWMkGHwhOfIFC/BWxLu4671smf20bs6jKrOuQPhRs7tzaY+hmuZAZ99XuUmrWfvp5lKzs8UqUyU9ALGyEcnOb9XTrs9DTqatVmHfl1mNSa+Mw9eqZ8zOFfWvGCQJn5sX/7soMGh+wHXUcgc44bbVhgZPfkFRHgRN0kMJO105B1/34wP5h2tAait8qAxVY2I/i2/QRYcBd4oLIqglRGYo1HlQRnxV4p1EGQrTSaSlZdjWe9xGmR1wf96KhXPWS8y4OrwdPJgI5GsJJeQ95twqlvtRDoac4L7y7Md4H/T8NuMPCbf3qfw6MZ4QbAO7nby/VSy3tKs6DOBMDhpHlw7fxzhi7YJr6tqBzmmrddWjaHot9a7T5Y238lwYjoD4Dp41upJiujC6QeNaL5M4KdPXVMORtOdS9nLj1FYNFXIJAJZPmHWI3X+Akw26lhEDr51dWDQ8+wns0HCZb2A53QQRYb72w/GjUN417z2n8YkgjRjf5tJOZpKxHP1Uf4eQTqc7gYJlWeqSwFPLQxgOVtU1JPuUHTwgF8Sf7/F8VQTGiXsPhcXIMTDeO3o4dJ0QHyj/VDoY6NtgnQdq3tnhhiWCNMrJ9UrZmLXPDQQWKXDVDicwE/sjKh7AWedBjlqN91IMxu08JhSh/Rs330Uk/0yKtKRljNVABgvi+rc3VruG3mGna+InjxHaypDO7Rp5VVGVkfuQQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39840400004)(366004)(136003)(396003)(6486002)(26005)(86362001)(2906002)(6666004)(38350700002)(66476007)(38100700002)(66946007)(478600001)(8676002)(36756003)(956004)(66556008)(1076003)(186003)(6506007)(6512007)(6916009)(83380400001)(5660300002)(2616005)(8936002)(4326008)(316002)(19627235002)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?n3uvr6aG2L/1uNELkQx8PqVlYfANkdtZZvThOsZrcaYXOluungUC9kwLgiIa?= =?us-ascii?Q?Chks7rQuxcp9pKS3NNxAU/6v7wfemiYMWiFGsXX9eeNXZPKLo1gcdzPav709?= =?us-ascii?Q?eTb6O9Hnbaob0wpilkV7OcIGs3c1hfqcnXHH4IjlfAF9UvFQ5ep0J7ImQUJ/?= =?us-ascii?Q?j/yTJmmi95hF6KP4XmHL/Bok5SUxJfJxgdpNtFqaEkfqYnqycoBwprSGvzwL?= =?us-ascii?Q?TcXFf0VUq15QJDQJKhD17cWctoFvsHvPT7DauIOvlwLJ3dDbK/ZNLcr7MyJi?= =?us-ascii?Q?U6yLfmkvrUoSLGGk7owmd7iPNR4qaDdOTQxWEQs+nQoUr2LBRPvMvr5Q8dCN?= =?us-ascii?Q?uojUC6JcSJ5tu/JI61bbeDy+0DL58ZSHuZC+/vWRgDyJmmkCPXI7rutV1qo4?= =?us-ascii?Q?nX/dLg8CBj9UgGEmUX/TAlk4ltXZ4Llz/4XULSajndfufV+t4fR4qxxJ/ef+?= =?us-ascii?Q?9mPwKfF0nHw0Cazc+d9eKAQiZDDoH7F9bdigB0f6x9pIC6pm6ic/WeXyMnmg?= =?us-ascii?Q?EV8oPHgfbT4OS+m+wxZ8wGaFVlTAAiiU96UtvDMsd0YoLtbsfoid2bMKOC8k?= =?us-ascii?Q?EudWgeXn5e4lomBzH6gvUO2iWMw8VLkLYcPFAzzl+dZ59/Trl+7CnXw9UunC?= =?us-ascii?Q?IZInxvwP+cnkhGeFs0ivcUv1jjGf6TNjC0mz3I9Gff9hPLna8XY1p9I2pILi?= =?us-ascii?Q?7mn5p1D8HRons8KuvSIGcUwDGWAmi3caNO/kqtyaxRP4rfVmM8IQbXE2wZkX?= =?us-ascii?Q?kvO6TWu4uVk3XqzYzMCXKoa17u5DJOjCfU04hyf1MMjan3unJXT9KvvO3GoX?= =?us-ascii?Q?/AW3pLO3wAkVkFh34f4m2aA+MYmp5IpG6vzdhx4imk9+YTG2dg+O/KkhBIny?= =?us-ascii?Q?O0laAmzQEvhQ391/b9OBLvohyyPFi0rda9ukKahSUWcBVK4yi6HvEClE2hxs?= =?us-ascii?Q?tWcTs11ZXDL9oV2QGYzwHU0U05amUIDLLzx19tNmNYF+8QE+MNujJYiKT6jn?= =?us-ascii?Q?d7oh9sjYWUz9QPj9y6/G53eef3/mrYUtOfaDNo6jfbGphwmoQLDJbYO32CYy?= =?us-ascii?Q?X8BObXx7vDlk2o2Dao3//06yGlaEfI4CYIAksvx/7C9IaxtsCC+c6VABC2BB?= =?us-ascii?Q?3TXa2eLqjGU1Pa7JOfgG9kV4XVOauq0maiZuV9275KzHQzYEZu/0HRAF9ZDH?= =?us-ascii?Q?UeQ06lLItGGuRyhVvJal9rfSzt85rT08z4mO2lFxUfVazII/knA2rsE5d2PT?= =?us-ascii?Q?hNN/P4udiGZA+2ViFWSzRWeaP4aETBK/uwQFjU26oH7q07JUhN37a4r0oeUQ?= =?us-ascii?Q?C7seeICzNGH2R0XZshN0+D+Z?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f359ae2-12eb-4292-6031-08d9776a1631 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:17.3662 (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: 0TV5xprP01SGpWo2QueZIcoyeSyLYRNAdoQoCZeuT0SkFKRUYXGNmipGM1+etKDQrzW3SRJsYKe6ug77XCJcW5kuzBVL908FjR9EHllKNDI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6071 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.20.115; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631615940486100001 Content-Type: text/plain; charset="utf-8" If image doesn't have any compressed cluster we can easily switch to zlib compression, which may allow to downgrade the image. That's mostly needed to support IMGOPTS=3D'compression_type=3Dzstd' in some iotests which do qcow2 downgrade. While being here also fix checkpatch complain against '#' in printf formatting. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/qcow2.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 9f1b6461c8..a841fa4c72 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -5250,6 +5250,38 @@ static int qcow2_load_vmstate(BlockDriverState *bs, = QEMUIOVector *qiov, qiov->size, qiov, 0, 0); } =20 +static int qcow2_has_compressed_clusters(BlockDriverState *bs) +{ + int64_t offset =3D 0; + int64_t bytes =3D bdrv_getlength(bs); + + if (bytes < 0) { + return bytes; + } + + while (bytes !=3D 0) { + int ret; + QCow2SubclusterType type; + unsigned int cur_bytes =3D MIN(INT_MAX, bytes); + uint64_t host_offset; + + ret =3D qcow2_get_host_offset(bs, offset, &cur_bytes, &host_offset, + &type); + if (ret < 0) { + return ret; + } + + if (type =3D=3D QCOW2_SUBCLUSTER_COMPRESSED) { + return 1; + } + + offset +=3D cur_bytes; + bytes -=3D cur_bytes; + } + + return 0; +} + /* * Downgrades an image's version. To achieve this, any incompatible featur= es * have to be removed. @@ -5307,9 +5339,10 @@ static int qcow2_downgrade(BlockDriverState *bs, int= target_version, * the first place; if that happens nonetheless, returning -ENOTSUP is= the * best thing to do anyway */ =20 - if (s->incompatible_features) { + if (s->incompatible_features & ~QCOW2_INCOMPAT_COMPRESSION) { error_setg(errp, "Cannot downgrade an image with incompatible feat= ures " - "%#" PRIx64 " set", s->incompatible_features); + "0x%" PRIx64 " set", + s->incompatible_features & ~QCOW2_INCOMPAT_COMPRESSION); return -ENOTSUP; } =20 @@ -5327,6 +5360,27 @@ static int qcow2_downgrade(BlockDriverState *bs, int= target_version, return ret; } =20 + if (s->incompatible_features & QCOW2_INCOMPAT_COMPRESSION) { + ret =3D qcow2_has_compressed_clusters(bs); + if (ret < 0) { + error_setg(errp, "Failed to check block status"); + return -EINVAL; + } + if (ret) { + error_setg(errp, "Cannot downgrade an image with zstd compress= ion " + "type and existing compressed clusters"); + return -ENOTSUP; + } + /* + * No compressed clusters for now, so just chose default zlib + * compression. + */ + s->incompatible_features &=3D ~QCOW2_INCOMPAT_COMPRESSION; + s->compression_type =3D QCOW2_COMPRESSION_TYPE_ZLIB; + } + + assert(s->incompatible_features =3D=3D 0); + s->qcow_version =3D target_version; ret =3D qcow2_update_header(bs); if (ret < 0) { --=20 2.29.2 From nobody Thu Apr 25 01:48:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631616128; cv=pass; d=zohomail.com; s=zohoarc; b=dXyP44XGoMG+gMmBJv/dQOIBMpgmb/6F2oQa7Kiv/8+nPoo4GE0sKwTYNU59D8XjHIo5znwYee75jd+QTc3i09i25bWKPEC6kiTg5mkcaPPMglnAyPwWcK4C+EWRbQfK+/vtdzVMyV1pG62iRaF1DNDyFMDUSddYxB/panVzKak= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631616128; h=Content-Type: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:References:Sender:Subject:To; bh=nSWfudO6mET02yX2UIAz9lnRXZeC3XZnEQ8avr5fR74=; b=RoKUE/45AaLX+FfaeCXT18ffuDzWyqvor0mORhB46oISBbdRIi6/qyBcFhu4axOH75gtQy9gY9rZLCDiYzO7zIIqEBx73efNdY7AbCdHpMoClytvxGU9tApRDTAkFwa3Dy5XWcWJKyew6GQuDNARHx78oqsfNsePaGzZHax446A= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631616128077922.6977865415963; Tue, 14 Sep 2021 03:42:08 -0700 (PDT) Received: from localhost ([::1]:58808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5t8-0006IL-4I for importer@patchew.org; Tue, 14 Sep 2021 06:42:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5e4-000574-Q9; Tue, 14 Sep 2021 06:26:32 -0400 Received: from mail-vi1eur05on2115.outbound.protection.outlook.com ([40.107.21.115]:28801 helo=EUR05-VI1-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 1mQ5e1-0003UG-VB; Tue, 14 Sep 2021 06:26:32 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6071.eurprd08.prod.outlook.com (2603:10a6:20b:29f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Tue, 14 Sep 2021 10:26:18 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:18 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:17 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IrvJB+J0t1aMKw3QTA5Qvb5qAvKqChJuqdN/yBTS3tzaVB4aXkjAzeegfQSB5GRrcQav5n26fFIXTcOL9FCEx3EotmbEWX1pQTkdrDpKSm3YAvNcpqGgcRSwqq9hl9+7E0S+T3jI38EQrncaEowuaYMk38SSdUbxpVVv8B9lRn0gkOEN9MwcRMS8kJgoInB6ZC8E8VHM5E/oF5+xAcWvZf4PrG/5+icEPeAtkv40cdHZ7zyX2yfJzsEqndW65gTVGAQa0JtNOqWQxKjs3timbLTORTdoFfLZZLUPcTmPFu1jxAelhPF2uc4dSBdjGIh6PXwQfnEzPuNC0I4pH5AReg== 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; bh=nSWfudO6mET02yX2UIAz9lnRXZeC3XZnEQ8avr5fR74=; b=fje+UBztkh/WP2kocDc5zXdYjyvFsDSsWb9weidpPOe0yhcLSAv+hbRXQrLu7Y4bnTjxstUND8jrm3ISFdPEasptIawaZgv9uIfAX79RLNaQpPYjqpFOIoAP7PY1jvDEmvpv45aFOrT+qMc8ZXIP73Pd5BQa9EyMIUPEoEjKbr/Yjh6XhiWZ/4pxW/s45HsvRhmS5ZhodlwdHi8M+6uDpH8/UpJES55ufRy5Hjh+VeMiMSEGIveHdEZUQhdF7LFzkRKOzIvl3kRGd1f6dsg8zd5v9Ohc/tNOSQqafNe8XrtvXhY44dAgAqEKXgdgWAKVKsRmFEqJLlTVMl5BNN9qCA== 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=nSWfudO6mET02yX2UIAz9lnRXZeC3XZnEQ8avr5fR74=; b=kUa5Zebdi4XzY8zzWktzEOa3ztyvpTOeZjPntfJVAroBeRIsHvXb+0qN3GGV4xYiHA2f/mFnlxenKAwTefBIoIt2UnDzFiULsMubDBXfwd9HFfm8/bI6pbK9qFcOhpAv2bEnqTKL8HCqwGQG7GgDORIRdaKfIxpnGICWpi3pBs8= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, Max Reitz Subject: [PATCH v3 11/17] iotests/common.rc: introduce _qcow2_dump_header helper Date: Tue, 14 Sep 2021 13:25:41 +0300 Message-Id: <20210914102547.83963-12-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 06bfa127-9d82-46d1-e1cf-08d9776a16d7 X-MS-TrafficTypeDiagnostic: AS8PR08MB6071: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3513; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nXZzd7ovMBgVj/YtJHL1hW6R1n9dRp5ZhoQTu/+xuSyt/omb0OTC9VJByiTb//23p31ulFVvU7lhzijUUNkkFi7G/ewdd9jiBRsJumKTohqf6O3U7AmZ+PyyXtKfVrpYO486Ioegh8xFJlDUFulN2C/eu90yZ+6b6zchgb/oQNidtjMqQp/RbN7rnuEzBmu9uH0rxuvb0N3F5toxiOYAcShagE6CIwge3Hg/hNnxrlU6r1S4Y2KFUuy1ADZ7NbbD/PzVuTnz7j99vZYEwD//rE6QAs1a5+O0QWFMoDcAoqv0ShmU714HMfS8aDE3UpPfZeAV+Hn6PDsWDhD7NFW/hJOejx3ASH0WlIBq3ouTEbQWYRi2eBMQ+bMEZWwYuJ20VnZ0D5BFuAs36S7NuxgK8FIc6He2/c/0+6xDG1r0rbtTY7XWjJyhX8WoLu0Jal0TeBVeVQUAHt1GWYCc3u7wF6OPZhs+gSNthHTgy/ZfiTccKIR2zcvy7L8yNfUBopdDeBGJTZuR1OTs28rNtRNMfP1w0fCyNi0wFiWZRp2u5ehd3ZYHHnxyhDhoy14frYwFCobWFq8vKrjc/TL41BtZuSehWxY84RaDiXvly7bOVLZLQHVi2HTxvW0n4J74WPghOBuW/r2mtg7ydf3IIAOIjLIEBEJM/SRYBjbCyMzoKCInL7IeYV06nlL1sbq5zzqa3cQFrFiAVaMYdmMxj4qY2A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39840400004)(366004)(136003)(396003)(6486002)(26005)(86362001)(4744005)(2906002)(6666004)(38350700002)(66476007)(38100700002)(66946007)(478600001)(8676002)(36756003)(956004)(66556008)(1076003)(186003)(6506007)(6512007)(6916009)(5660300002)(2616005)(8936002)(4326008)(316002)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Alp6wb49+kGC5Kkh73H7czl0Iusq24BQ35jfSkhsUEah+hF73P3tYopQmeeM?= =?us-ascii?Q?Wd8dh0+5QFXg+hI9+tCP9xrISlLh3JlY+LHYqAL5xvryVs4ekzvNc2ZiEAqj?= =?us-ascii?Q?kIUqWXzgdak+YwWeEJUh9HiIpgM520Uay4MNs9GDKdaKDiXqih+zw0vWGXMF?= =?us-ascii?Q?utqWw4ru3+7PuYmQGOX1fUPEu+LL4oH7dFNBy7PfBh8ipO5kICe7QpVzZL2S?= =?us-ascii?Q?rleN74NJ8QtiGjO6qnB4N67kLS6xa1JFmCViAfyqmlLBmeY/99HPElnxKppC?= =?us-ascii?Q?5jldGy3lU26Um2oUwSZyNOrgrQB10tZP2iHlPzy7wa4PVzH4jPsS8ctjLKXE?= =?us-ascii?Q?xp/Sxv4P9UJzXhQTAgr5NSgOtuuYLRypCI0Y+jkAShJs+2LQ6yn5dMtZD3Tt?= =?us-ascii?Q?2NeXrgi9naEAxomAIwO5dSIni8Bh82ANIuczRY9I+xVe335C1c5Ouf1ukcln?= =?us-ascii?Q?1zO2RNkD1LCH6LbpCfe64h/hngZnMvvlOo9Bp5+ABAWedYuVyu8xh+w6IUe0?= =?us-ascii?Q?oVIC4TK8MMthF4RPe6UbMJbGoJCgqRGOFv9rYSPbPt+pCm4smeCh/TCP5K5A?= =?us-ascii?Q?hv8D9UOOulArHfKSnUGnMVihg3nQdI1/N9+OI6UGplh0QacTEKLjcBt7rnXi?= =?us-ascii?Q?Asd1jCTfMnnmdAGd5le+nnnVbhu5Sc4Q0PvuGeKpypBGnIzpbmQ6IVJewl0y?= =?us-ascii?Q?njLJeaPYiNAADQteIE+x1mmEAWxy7gzXQNVphUrzTj7xJwC6qW/IMjzsf3Gm?= =?us-ascii?Q?gORaTLu9KvKCMoVuhwsaZfYLDQNImUL0KxA52g124QC9Q9aekcaSu3oRnSE0?= =?us-ascii?Q?nuWGkqGxGVrdPkCh09mdnN9NCW5nlGd9n8ND6Zp7fYb0YGI3KsDZuOiY3blR?= =?us-ascii?Q?ymr08mW242ntxDAgyfd5qpjIyDy4+DVhYKeR2E2MdfMejDHR9Rz6Uv9rcLLR?= =?us-ascii?Q?P5JddlaRlj0xw21p4Mk+YlvwqEO46DjQGiRxYBCtIeHoPk2dG/+/mbkdeWnH?= =?us-ascii?Q?IEZoKEuNa8QesBLD9QcoZIIl0scf3bgaL7f829ECDl3ybKoqeRdIx/nzH8j4?= =?us-ascii?Q?9qIIM/Bk9FCFFfy9HWx9dZtCxp9kaUa2dfpVyj8EtKRWsQ8Dd6LYjEPHnoby?= =?us-ascii?Q?G8baTgecCMVsTER0HSL5is8y7PTJyV1kJ7nTtKnN/d5Zd+GgJrdyuBKg7Bew?= =?us-ascii?Q?/TG1HkZ8iV3F7p+Q1qDtOj6JGU+Glsg5B1IaZu0jh84EdtEPfhJSOEbaUWcJ?= =?us-ascii?Q?IXPcpFtL/sy1Zejc/qlg6CmIpxq8dJIL0KQ/5XmgXllUvnoevqYfnm+N9M+C?= =?us-ascii?Q?dwGC4SZmTNJWE+snjy+IFuLV?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06bfa127-9d82-46d1-e1cf-08d9776a16d7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:18.4744 (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: bThESDIY7voS0kjt2KBze7F+0k0rx9/fBctMqbAhpGUMuI8Zf4298FzAnAe9pxkWUJ3nirooo1TEIDOTpePd02JdBFBIboVbZgGseH16924= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6071 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.115; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631616128664100001 Content-Type: text/plain; charset="utf-8" We'll use it in tests instead of explicit qcow2.py. Then we are going to add some filtering in _qcow2_dump_header. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/common.rc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index d8582454de..5dea310ea0 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -996,5 +996,15 @@ _require_one_device_of() _notrun "$* not available" } =20 +_qcow2_dump_header() +{ + img=3D"$1" + if [ -z "$img" ]; then + img=3D"$TEST_IMG" + fi + + $PYTHON qcow2.py "$img" dump-header +} + # make sure this script returns success true --=20 2.29.2 From nobody Thu Apr 25 01:48:44 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631616257; cv=pass; d=zohomail.com; s=zohoarc; b=O474iBq6eGwNuOI0e0o5cpXTfU85OYZ2D1juw/FsfkYHCpiqDwSDLxGWsPlu1J34Gz82H4PgPz7DzTev+hALnUCzpEllpXJnGHgk9UI3lzqu+R4LInehHq+eTJAQbk+EyjeOWYGwYVufRbCKYOh1fqMKk3TtVGpuXob/zbnBJMI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631616257; h=Content-Type: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:References:Sender:Subject:To; bh=J1j0tfa4dqplR197C7cueCRvfxSWt4GHVx3+nwnhavc=; b=ZnQ7hBkjqILoSCQfE5iR6MCyPe4NJ7bprTHoQn/opqTPf4mkeCkemDExEqCvKyXBm1QE9n1SqG1GaraT8hFhCSaqojQ4zIU8ueRMkbD95Aj2IPRpgIO0T9glb14ZK8DVF99hHDYEGcL2pVW36YC+MgZ6exz9yJWLFjv2TXwBAkU= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631616257831736.2562916892575; Tue, 14 Sep 2021 03:44:17 -0700 (PDT) Received: from localhost ([::1]:37046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5vE-0002Be-KQ for importer@patchew.org; Tue, 14 Sep 2021 06:44:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5e6-0005C1-6u; Tue, 14 Sep 2021 06:26:34 -0400 Received: from mail-db8eur05on2115.outbound.protection.outlook.com ([40.107.20.115]:20224 helo=EUR05-DB8-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 1mQ5e3-0003Ok-Fo; Tue, 14 Sep 2021 06:26:33 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6071.eurprd08.prod.outlook.com (2603:10a6:20b:29f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Tue, 14 Sep 2021 10:26:19 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:19 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C1UsKSNhB4FjZBebXiZtvuQZ/zDIojXCZU2krlDRMICyISTdbxnYDTgwDAeIiAP26qd/pGF+vJpjbxR5L5wCw+kkf2K3urhWEg1X1WCdQJrJQpdAEZWavGihQUE44gjbMhTFlDT+zvUHaAeQVNfkZFLbQxp1ArTucBGcKvm0VrGphcaYCaPNVXgGm5di9TTLE1+9Rl/qIXyUH4OO1XPVVYFYjEu8ocVGwYqEd62pfDj+0zuH8jE8quyH8+QmmldC1ranoEeZYjZijriC7NVaeNpJVR/4oBBuqKQvYqKFsc0j3W3X68j4UcMFxDrykL2rMbonA5O1cu0t6c0gBQYHwg== 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; bh=J1j0tfa4dqplR197C7cueCRvfxSWt4GHVx3+nwnhavc=; b=Cku3s7I1EDvoFdbay72rzN8nKsNl/5xpgA1CZzCzsCHUH5qYqPIoNJ7tfGWCZkYyvPT2aSwjP/5VN0bQngNXdQaovQIxXp93+cXsrxYecnF+H4rWzMHDo1cZrqN+VBDT+hknx/UdOYvYnqzTRQR6QJiPf5I/9q9588hyk8607RGEClXc0SmklLvP4wP/Fx3J/ALMi92BXKzJonNJkCN23LGFWB5P9MSkm8lvDExy9kXBPlrbd54ZjJ6g1y+YPj+l8Sednxpu/+8HL9zmoxNerIBPNbvm9nlaq4KVZSUOfYyagtdW7MLKc9QaYjtHQoDiGzIdkjiACaRNnkSIq2pMvQ== 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=J1j0tfa4dqplR197C7cueCRvfxSWt4GHVx3+nwnhavc=; b=SN+moc+SRlfYGhZP1wjaIXIGBRf4IxmyYUuHxTa/8BmxnX6J6TRIvu/9GgzCE4CtxO5JgaIuQYXD9slWWzRl4sVm1SkNgQZ09H7fENn4ddgX6JW1FGmtGe7ywoReki64nlVp3vjN8EVm47n8tPT0l02ABxId3aM6eFgDX7SERjQ= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, Max Reitz Subject: [PATCH v3 12/17] iotests: massive use _qcow2_dump_header Date: Tue, 14 Sep 2021 13:25:42 +0300 Message-Id: <20210914102547.83963-13-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 93109484-e4c3-45e3-7d7e-08d9776a1782 X-MS-TrafficTypeDiagnostic: AS8PR08MB6071: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:55; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: V3UL5Ctk+Lmd4ROCuC1IlKxfQDAx6Jyp7EEOsyCQV01m37cs75jKAIp8OuCJNpSbBjTmgm8sii07pJKX0PLv+oEUMwbC5Hs5DWGxXV+VUFevt22O/K4fURu9BnwPVhkfkwZu1OissmYXFqixeMhg0bT89DoExmn0KjnkNfxGuWriR55i2Ct/fuba8AJPsouilBpf4wCW/yKd9DTt1xGe/ygMRQBkHPqjdKcT3WaePcqExOR2h+/XaMtKlr4yEHRYKNQ7jggKU32msR8lWt3MRyc87jWeQIBS3gqNAXsiM9LhdRhUl996p9Q2Tdo7b+fIU5B4kuG46K5/WQOyJ9R5OORmJlqhlDA2ePF/c/1b2LUyVBmx2ajh7RSp8NwFAjPzFESnjmj1tVIKbsV5SdCADckOZpyp/nyTUkdjqw3kja0AkI1oVKP1J2KqqxYnSwkwWysWp4eOZZcs5jIeTsxhk78XkSIa9kbfM5RVvQ3/Z8Oz1QYxaOMDQqO+vO5r7PjQFLayzEiEIq38E0AYO5/F2GgmaaT8bcOHIEeLqPn5baRU82jFQTuxHz3OvlAg0SNuADYxIupu8gL81jFv+SFxO/qjZfWX856BCjg8emnozMAGFnsoGMj7M/slCbvEsScuYSCZ0puLfxuFVw9gyiz3zBD0SU46P41+v8keppuKL9awioEkwrYRSDW6Fs/7HANLC5Wv/kkYM7r0jXsZET3q+A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39840400004)(366004)(136003)(396003)(6486002)(26005)(86362001)(30864003)(2906002)(6666004)(38350700002)(66476007)(38100700002)(66946007)(478600001)(8676002)(36756003)(956004)(66556008)(1076003)(186003)(6506007)(6512007)(6916009)(83380400001)(5660300002)(2616005)(8936002)(4326008)(316002)(52116002)(14583001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sOF8KkrUgdb1jx+EXP100BtR8DG/w9GG+94V1rD0xZZUUvPXaMd6o6xL+wx3?= =?us-ascii?Q?SrxFKjiqYNLtrzlg15dnNKvSybQ9m1zkan2Swtn7jkwzKpUeZCdwwLEhsZA6?= =?us-ascii?Q?l1gSOXq65SOcyj88lOPCe+mGjjYwoZkGbjN2iuV0pGVmGN0rvojvVYjbHsge?= =?us-ascii?Q?z8GEIX5YXjlpnl4dNeeWBIy/K87Wn2UhDUReTLqPEo6ZccNTZvNuGkiHSYJH?= =?us-ascii?Q?pUPazkVSStSE44J8JY/QnZx+ZxBCkLXUPKI2FAioaJJ5vRi0w+tWAfKTpreB?= =?us-ascii?Q?DzhqMgMsG8KE3m9Ip2ivG5k4Otp2Zltyf/dDtF0+L9gLNoAkwZb4wSQqglRd?= =?us-ascii?Q?niZjmTEXkcdrHhzso2hkIEQn20BB29P1DKGPLX0+E2doRcLc39Bbqg8j0zk/?= =?us-ascii?Q?fLJXj5+5MnCfQXTCXyAnRWpHOZlx4FXzpNIFXi9mjOn3iU5Eimh7K9FaKX8u?= =?us-ascii?Q?nYUVHumMbpo+9+HYSwJs8RaZq7lwmGKWvK4DqKAI7PVNNiYpYOc4LwR78xtf?= =?us-ascii?Q?73RE1nLpWYxH6CJr8kd5l5abMM34hJ9CGU1tjRdvXXRbegwZLiAqh7rM82p9?= =?us-ascii?Q?WpL675SNWBlzakuSpSF3P+43hShDr+w6e4XbbtJAYhyVCQDei0t6tdWP+9GQ?= =?us-ascii?Q?klpbyNvaYLK6Hgfis59RNM1Rh9tCNZEggxDfeBWnMgfQD9GZnQfoYl0pQriB?= =?us-ascii?Q?utIcO7JBIqiv+d5ivQ5sDSmpEQzAVb/0gBGShJFbNEw+WXvkY+5iG3Bh0ag+?= =?us-ascii?Q?Kd1R518dpL870OEqAePVbPoBzgnQjlDaxnuUk5QYsz10B8BMZoyAB5drz7uu?= =?us-ascii?Q?BVajJP+9B869wY9MXJbHMIoVP7eGMUojIMUnCJ1/RPRI9384kE2hr2TIjSFB?= =?us-ascii?Q?P4fe2WyfuaizVQPYSVlW7u7qliQM6PsrOlfFU+B8ZYE22HG7I0YYzejUBdaC?= =?us-ascii?Q?qFwUQaZOdrtVaJ8/hg/IGhZFPDraYec6N+wJiEzv0iHhm+CSGt4gwcIMvTJ9?= =?us-ascii?Q?H4bCdv0lPrUKc2Qf5PZmzRUUffXa+/tndWshXYxc1jKt3kOCgst5adD+8G2Z?= =?us-ascii?Q?MpIGAREoVCA6vQrLLcLhgaB+VcrQnCpb/sCVXWPrlZHQZmdXbliHMwn0ixbc?= =?us-ascii?Q?t5el4ZarKmL3Lb1tuJsPt9q09DeU6eRsfNyuYpLDvBwVgww7mlf5yROO1R72?= =?us-ascii?Q?W3yC28we3EdTjArz2BYPoGnw558npzekwqVT5UVa1ssEifOeNqnEy6wh9A5X?= =?us-ascii?Q?r5m4AdXcXZttkVGsVfVSu+Ah4em6wthL2ayJzqKklcSpsdU+gvO6FHKlW9bq?= =?us-ascii?Q?e7b+b+74sG+WrbkKQZSIR9vQ?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93109484-e4c3-45e3-7d7e-08d9776a1782 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:19.5676 (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: cffy3A+hW4RLWn9fXESnSs+46EZRy0dZPVlAQsS+/kYXuq3epEjqsIr2haP0iiTIQA9sAY7+i6VwODTw+rTqgh16ijnaqawiByMKAy6Vd+w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6071 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.20.115; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631616258393100003 Content-Type: text/plain; charset="utf-8" We are going to add filtering in _qcow2_dump_header and want all tests use it. The patch is generated by commands: cd tests/qemu-iotests sed -ie 's/$PYTHON qcow2.py "$TEST_IMG" dump-header\($\| \)/_qcow2_dump_h= eader\1/' ??? tests/* (the difficulty is to avoid converting dump-header-exts) Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/031 | 6 +++--- tests/qemu-iotests/036 | 6 +++--- tests/qemu-iotests/039 | 20 ++++++++++---------- tests/qemu-iotests/060 | 20 ++++++++++---------- tests/qemu-iotests/061 | 36 ++++++++++++++++++------------------ tests/qemu-iotests/137 | 2 +- tests/qemu-iotests/287 | 8 ++++---- 7 files changed, 49 insertions(+), 49 deletions(-) diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 index 58b57a0ef2..648112f796 100755 --- a/tests/qemu-iotests/031 +++ b/tests/qemu-iotests/031 @@ -58,21 +58,21 @@ for compat in "compat=3D0.10" "compat=3D1.1"; do echo _make_test_img -o $compat 64M $PYTHON qcow2.py "$TEST_IMG" add-header-ext 0x12345678 "This is a test= header extension" - $PYTHON qcow2.py "$TEST_IMG" dump-header + _qcow2_dump_header _check_test_img =20 echo echo =3D=3D=3D Rewrite header with no backing file =3D=3D=3D echo $QEMU_IMG rebase -u -b "" "$TEST_IMG" - $PYTHON qcow2.py "$TEST_IMG" dump-header + _qcow2_dump_header _check_test_img =20 echo echo =3D=3D=3D Add a backing file and format =3D=3D=3D echo $QEMU_IMG rebase -u -b "/some/backing/file/path" -F host_device "$TEST= _IMG" - $PYTHON qcow2.py "$TEST_IMG" dump-header + _qcow2_dump_header done =20 # success, all done diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 index 5e567012a8..f703605e44 100755 --- a/tests/qemu-iotests/036 +++ b/tests/qemu-iotests/036 @@ -58,7 +58,7 @@ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible= 63 =20 # Without feature table $PYTHON qcow2.py "$TEST_IMG" del-header-ext 0x6803f857 -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features +_qcow2_dump_header | grep features $PYTHON qcow2.py "$TEST_IMG" dump-header-exts _img_info =20 @@ -107,7 +107,7 @@ echo =3D=3D=3D Create image with unknown autoclear feat= ure bit =3D=3D=3D echo _make_test_img 64M $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63 -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features +_qcow2_dump_header | grep features $PYTHON qcow2.py "$TEST_IMG" dump-header-exts =20 echo @@ -115,7 +115,7 @@ echo =3D=3D=3D Repair image =3D=3D=3D echo _check_test_img -r all =20 -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features +_qcow2_dump_header | grep features $PYTHON qcow2.py "$TEST_IMG" dump-header-exts =20 # success, all done diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 index 12b2c7fa7b..8e783a8380 100755 --- a/tests/qemu-iotests/039 +++ b/tests/qemu-iotests/039 @@ -59,7 +59,7 @@ _make_test_img -o "compat=3D1.1,lazy_refcounts=3Don" $size $QEMU_IO -c "write -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io =20 # The dirty bit must not be set -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features _check_test_img =20 echo @@ -73,7 +73,7 @@ $QEMU_IO -c "write -P 0x5a 0 512" \ | _filter_qemu_io =20 # The dirty bit must be set -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features _check_test_img =20 echo @@ -82,7 +82,7 @@ echo "=3D=3D Read-only access must still work =3D=3D" $QEMU_IO -r -c "read -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io =20 # The dirty bit must be set -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features =20 echo echo "=3D=3D Repairing the image file must succeed =3D=3D" @@ -90,7 +90,7 @@ echo "=3D=3D Repairing the image file must succeed =3D=3D" _check_test_img -r all =20 # The dirty bit must not be set -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features =20 echo echo "=3D=3D Data should still be accessible after repair =3D=3D" @@ -108,12 +108,12 @@ $QEMU_IO -c "write -P 0x5a 0 512" \ | _filter_qemu_io =20 # The dirty bit must be set -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features =20 $QEMU_IO -c "write 0 512" "$TEST_IMG" | _filter_qemu_io =20 # The dirty bit must not be set -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features =20 echo echo "=3D=3D Creating an image file with lazy_refcounts=3Doff =3D=3D" @@ -126,7 +126,7 @@ $QEMU_IO -c "write -P 0x5a 0 512" \ | _filter_qemu_io =20 # The dirty bit must not be set since lazy_refcounts=3Doff -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features _check_test_img =20 echo @@ -141,7 +141,7 @@ $QEMU_IO -c "write 0 512" "$TEST_IMG" | _filter_qemu_io $QEMU_IMG commit "$TEST_IMG" =20 # The dirty bit must not be set -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features $PYTHON qcow2.py "$TEST_IMG".base dump-header | grep incompatible_features =20 _check_test_img @@ -159,7 +159,7 @@ $QEMU_IO -c "reopen -o lazy-refcounts=3Don" \ | _filter_qemu_io =20 # The dirty bit must be set -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features _check_test_img =20 _make_test_img -o "compat=3D1.1,lazy_refcounts=3Don" $size @@ -171,7 +171,7 @@ $QEMU_IO -c "reopen -o lazy-refcounts=3Doff" \ | _filter_qemu_io =20 # The dirty bit must not be set -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features _check_test_img =20 =20 diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 index db26c6b246..d1e3204d4e 100755 --- a/tests/qemu-iotests/060 +++ b/tests/qemu-iotests/060 @@ -80,13 +80,13 @@ poke_file "$TEST_IMG" "$l1_offset" "\x80\x00\x00\x00\x0= 0\x03\x00\x00" _check_test_img =20 # The corrupt bit should not be set anyway -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features =20 # Try to write something, thereby forcing the corrupt bit to be set $QEMU_IO -c "$OPEN_RW" -c "write -P 0x2a 0 512" | _filter_qemu_io =20 # The corrupt bit must now be set -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features =20 # This information should be available through qemu-img info _img_info --format-specific @@ -114,19 +114,19 @@ poke_file "$TEST_IMG" "$(($rb_offset+8))" "\x00\x01" # Redirect new data cluster onto refcount block poke_file "$TEST_IMG" "$l2_offset" "\x80\x00\x00\x00\x00\x02\x00\x00" _check_test_img -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features $QEMU_IO -c "$OPEN_RW" -c "write -P 0x2a 0 512" | _filter_qemu_io -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features =20 # Try to fix it _check_test_img -r all =20 # The corrupt bit should be cleared -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features =20 # Look if it's really really fixed $QEMU_IO -c "$OPEN_RW" -c "write -P 0x2a 0 512" | _filter_qemu_io -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features =20 echo echo "=3D=3D=3D Testing cluster data reference into inactive L2 table =3D= =3D=3D" @@ -139,13 +139,13 @@ $QEMU_IO -c "$OPEN_RW" -c "write -P 2 0 512" | _filte= r_qemu_io poke_file "$TEST_IMG" "$l2_offset_after_snapshot" \ "\x80\x00\x00\x00\x00\x04\x00\x00" _check_test_img -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features $QEMU_IO -c "$OPEN_RW" -c "write -P 3 0 512" | _filter_qemu_io -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features _check_test_img -r all -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features $QEMU_IO -c "$OPEN_RW" -c "write -P 4 0 512" | _filter_qemu_io -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features =20 # Check data $QEMU_IO -c "$OPEN_RO" -c "read -P 4 0 512" | _filter_qemu_io diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 index 9507c223bd..70edf1a163 100755 --- a/tests/qemu-iotests/061 +++ b/tests/qemu-iotests/061 @@ -55,9 +55,9 @@ echo "=3D=3D=3D Testing version downgrade with zero expan= sion =3D=3D=3D" echo _make_test_img -o "compat=3D1.1,lazy_refcounts=3Don" 64M $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io -$PYTHON qcow2.py "$TEST_IMG" dump-header +_qcow2_dump_header $QEMU_IMG amend -o "compat=3D0.10" "$TEST_IMG" -$PYTHON qcow2.py "$TEST_IMG" dump-header +_qcow2_dump_header $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io _check_test_img =20 @@ -68,10 +68,10 @@ _make_test_img -o "compat=3D1.1,lazy_refcounts=3Don" 64M $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io $QEMU_IO -c "write -z 32M 128k" "$TEST_IMG" | _filter_qemu_io $QEMU_IO -c map "$TEST_IMG" | _filter_qemu_io -$PYTHON qcow2.py "$TEST_IMG" dump-header +_qcow2_dump_header $QEMU_IMG amend -o "compat=3D0.10" --image-opts \ driver=3Dqcow2,file.filename=3D$TEST_IMG,l2-cache-entry-size=3D4= 096 -$PYTHON qcow2.py "$TEST_IMG" dump-header +_qcow2_dump_header $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io $QEMU_IO -c "read -P 0 32M 128k" "$TEST_IMG" | _filter_qemu_io $QEMU_IO -c map "$TEST_IMG" | _filter_qemu_io @@ -84,9 +84,9 @@ _make_test_img -o "compat=3D1.1,lazy_refcounts=3Don" 64M _NO_VALGRIND \ $QEMU_IO -c "write -P 0x2a 0 128k" -c flush \ -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 | _filter_qemu_io -$PYTHON qcow2.py "$TEST_IMG" dump-header +_qcow2_dump_header $QEMU_IMG amend -o "compat=3D0.10" "$TEST_IMG" -$PYTHON qcow2.py "$TEST_IMG" dump-header +_qcow2_dump_header $QEMU_IO -c "read -P 0x2a 0 128k" "$TEST_IMG" | _filter_qemu_io _check_test_img =20 @@ -96,9 +96,9 @@ echo _make_test_img -o "compat=3D1.1" 64M $PYTHON qcow2.py "$TEST_IMG" set-feature-bit compatible 42 $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 42 -$PYTHON qcow2.py "$TEST_IMG" dump-header +_qcow2_dump_header $QEMU_IMG amend -o "compat=3D0.10" "$TEST_IMG" -$PYTHON qcow2.py "$TEST_IMG" dump-header +_qcow2_dump_header _check_test_img =20 echo @@ -106,9 +106,9 @@ echo "=3D=3D=3D Testing version upgrade and resize =3D= =3D=3D" echo _make_test_img -o "compat=3D0.10" 64M $QEMU_IO -c "write -P 0x2a 42M 64k" "$TEST_IMG" | _filter_qemu_io -$PYTHON qcow2.py "$TEST_IMG" dump-header +_qcow2_dump_header $QEMU_IMG amend -o "compat=3D1.1,lazy_refcounts=3Don,size=3D128M" "$TEST_I= MG" -$PYTHON qcow2.py "$TEST_IMG" dump-header +_qcow2_dump_header $QEMU_IO -c "read -P 0x2a 42M 64k" "$TEST_IMG" | _filter_qemu_io _check_test_img =20 @@ -120,29 +120,29 @@ $QEMU_IO -c "write -P 0x2a 24M 64k" "$TEST_IMG" | _fi= lter_qemu_io $QEMU_IMG snapshot -c foo "$TEST_IMG" $QEMU_IMG resize "$TEST_IMG" 64M && echo "unexpected pass" -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep '^\(version\|size\|nb_snap= \)' +_qcow2_dump_header | grep '^\(version\|size\|nb_snap\)' =20 $QEMU_IMG amend -o "compat=3D1.1,size=3D128M" "$TEST_IMG" || echo "unexpected fail" -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep '^\(version\|size\|nb_snap= \)' +_qcow2_dump_header | grep '^\(version\|size\|nb_snap\)' =20 $QEMU_IMG snapshot -c bar "$TEST_IMG" $QEMU_IMG resize --shrink "$TEST_IMG" 64M || echo "unexpected fail" -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep '^\(version\|size\|nb_snap= \)' +_qcow2_dump_header | grep '^\(version\|size\|nb_snap\)' =20 $QEMU_IMG amend -o "compat=3D0.10,size=3D32M" "$TEST_IMG" && echo "unexpected pass" -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep '^\(version\|size\|nb_snap= \)' +_qcow2_dump_header | grep '^\(version\|size\|nb_snap\)' =20 $QEMU_IMG snapshot -a bar "$TEST_IMG" || echo "unexpected fail" -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep '^\(version\|size\|nb_snap= \)' +_qcow2_dump_header | grep '^\(version\|size\|nb_snap\)' =20 $QEMU_IMG snapshot -d bar "$TEST_IMG" $QEMU_IMG amend -o "compat=3D0.10,size=3D32M" "$TEST_IMG" || echo "unexpected fail" -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep '^\(version\|size\|nb_snap= \)' +_qcow2_dump_header | grep '^\(version\|size\|nb_snap\)' =20 _check_test_img =20 @@ -154,9 +154,9 @@ _make_test_img -o "compat=3D1.1,lazy_refcounts=3Don" 64M _NO_VALGRIND \ $QEMU_IO -c "write -P 0x2a 0 128k" -c flush \ -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 | _filter_qemu_io -$PYTHON qcow2.py "$TEST_IMG" dump-header +_qcow2_dump_header $QEMU_IMG amend -o "lazy_refcounts=3Doff" "$TEST_IMG" -$PYTHON qcow2.py "$TEST_IMG" dump-header +_qcow2_dump_header $QEMU_IO -c "read -P 0x2a 0 128k" "$TEST_IMG" | _filter_qemu_io _check_test_img =20 diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137 index 4680d5df3d..52ee135184 100755 --- a/tests/qemu-iotests/137 +++ b/tests/qemu-iotests/137 @@ -140,7 +140,7 @@ $QEMU_IO \ =20 # The dirty bit must not be set # (Filter the external data file bit) -if $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features \ +if _qcow2_dump_header | grep incompatible_features \ | grep -q '\<0\>' then echo 'ERROR: Dirty bit set' diff --git a/tests/qemu-iotests/287 b/tests/qemu-iotests/287 index 22ce9ff0e4..6716419da4 100755 --- a/tests/qemu-iotests/287 +++ b/tests/qemu-iotests/287 @@ -61,13 +61,13 @@ echo echo "=3D=3D=3D Testing compression type incompatible bit setting for zlib= =3D=3D=3D" echo _make_test_img -o compression_type=3Dzlib 64M -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features =20 echo echo "=3D=3D=3D Testing compression type incompatible bit setting for zstd= =3D=3D=3D" echo _make_test_img -o compression_type=3Dzstd 64M -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features =20 echo echo "=3D=3D=3D Testing zlib with incompatible bit set =3D=3D=3D" @@ -75,7 +75,7 @@ echo _make_test_img -o compression_type=3Dzlib 64M $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 3 # to make sure the bit was actually set -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features =20 if $QEMU_IMG info "$TEST_IMG" >/dev/null 2>&1 ; then echo "Error: The image opened successfully. The image must not be open= ed." @@ -87,7 +87,7 @@ echo _make_test_img -o compression_type=3Dzstd 64M $PYTHON qcow2.py "$TEST_IMG" set-header incompatible_features 0 # to make sure the bit was actually unset -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features =20 if $QEMU_IMG info "$TEST_IMG" >/dev/null 2>&1 ; then echo "Error: The image opened successfully. The image must not be open= ed." --=20 2.29.2 From nobody Thu Apr 25 01:48:44 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631615967; cv=pass; d=zohomail.com; s=zohoarc; b=cdZ3kWUkQPPRCdBA0CoH4xvMvRCO/VRG6hd+dtL56fd+iuJVCpGpbSH7x87X6aGErEqO3gPNtvU+S7hMAjHOEdW1V3P1JiBvneCEzHtfnmD22SmA88bpkN3ChGEBgx9By/x2Wy02KVN4uqLJsl36MkQGtIsCV+8hq8CKwrsHzfM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631615967; h=Content-Type: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:References:Sender:Subject:To; bh=6J+dwDpCysg/7qyJjv5QTvew3DzMfuZNessktrypt4w=; b=A9rp3//QMUBXsxvzql/gVjDyPkYwDtzlFLPNuDLzTgM+TPRM+XvimaPlvL14pY5yoeCepqKwz7mgxScWvbxH+KuQkR3sR69sR8fJsb2a1ULIXb2882M8+++podDvSk+QFr6zUi2RkoTQ0fH/pK+9Y3AAEBD1r+eYzMBxrA/W4cA= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631615967724535.6497607496988; Tue, 14 Sep 2021 03:39:27 -0700 (PDT) Received: from localhost ([::1]:54314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5qY-0003Dl-Kk for importer@patchew.org; Tue, 14 Sep 2021 06:39:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51192) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5e8-0005Jr-JN; Tue, 14 Sep 2021 06:26:36 -0400 Received: from mail-vi1eur05on2115.outbound.protection.outlook.com ([40.107.21.115]:28801 helo=EUR05-VI1-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 1mQ5e5-0003UG-JZ; Tue, 14 Sep 2021 06:26:36 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6071.eurprd08.prod.outlook.com (2603:10a6:20b:29f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Tue, 14 Sep 2021 10:26:20 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:20 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ipXnx2weASaI0U4bYXcWkeu6nqIP6kU+KMXtxe9+UWyAiYjl4ucK+u255tHlQ+l840ZYFtnEUA0XHxxmnQnh+OG5CnPemJ6WYIyUxoLTbMN+Dbe9CwCoyh1sq6pwA0Ip+vcDiAfJEV7gnEKP+wcsXyoJG7JR6yUH4YC50Rbm00X5vxS6KCyJMn8uEwnhqZYuicQmqbafdYogunFwu9jpZdc8rxcE8LUJwvMouwTq/akf4yp0gQT2T0Yad3XP5W2V1XZxbWdrSNZZsNqN7m7PI0mN3J9fe0BoE6mVipKQfw/nIBGkMILReBPomEOjouTZ4TehYQ9/eOyeAtrmyn4PVQ== 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; bh=6J+dwDpCysg/7qyJjv5QTvew3DzMfuZNessktrypt4w=; b=O/OIBWX1fUT5z4up++l94gbBAtOqjBt70KPS/dlv9KCmPWVAIcXHRfPE1GJ6bRlyIf+K+D/7PMwGqsDvf+e0v4DMrGwO1oOsaC9elH9AbQNU1iLBkShoN1OToGp71viPPoa/EjU5bIPMN0jjelVoQLyFGS9Lbpm8dyvPWG3xpxcATwxDn6/NG5aphD27z4PlBFBUTXw6dhiYfbDu9MQgSFcz9cYZCWOskQOQEFtEL/jdyb9M/qybWTCuWJji14WQmbtvQnNSrexl70rjk3kGp+0KSR1F8zvg8yCjFT2QFMKLAZfnFC9zSjy6L5oq55+AJWTmwMhoOPWV+u9lBq4TrA== 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=6J+dwDpCysg/7qyJjv5QTvew3DzMfuZNessktrypt4w=; b=iVpFm0ZKd6McTe9FNr2n2inaZtMU0xceJvJ2e5Aws07CXntonSL1X9nqYqIjX1kNKLUrWq3cRIZiNn/FSg0+08k6pGZzQxCXUTjM6WH24DKxZPoZj4I8G41GTtcC1IjWC/D5FiPywTFr3eUq5d/3/QaPCmqjuijNTWiJudKaDcU= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, Max Reitz Subject: [PATCH v3 13/17] iotest 39: use _qcow2_dump_header Date: Tue, 14 Sep 2021 13:25:43 +0300 Message-Id: <20210914102547.83963-14-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d7ef1485-a087-4b9f-b7b2-08d9776a1826 X-MS-TrafficTypeDiagnostic: AS8PR08MB6071: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:47; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oClvJ9xjqcwyBQAzz2N8C9l3yJoB8wcEiZ3Y8R8qLpxT4mstKLwXX7iHnriuoPZRS3q/dduWfX8QjBfuEhNXiGem2wwMtEtpbveLGxk0JutRqofhufdlI6xMyBPeNJHLFQfUgf3XuR+qtLPx+FCVpjPw9EtmtjsDzZMRY8INPwLzlk0fh4VbcBC5PSVOBwsAtfGXlJKshj+u4IgzWAo4Lv2RP5Xu0RjI5KE5YuDNQmz7x60/lQ3bt6Lqe/fwd1Nx+yspuu853zQIehBPviccR59EVsTgIKpyM53idXjaSH1M/6yjbLPTNFKLq1vtrgREl1ArQZlIox1mqyvBdPP6tLObZO6i3UL7CvDxQORxDYxCKxkRkT9Z4A3bRoZv2XU5RA846lyF9qIcCGPcuKsJkwkBp5viMq8lawrFk/v+11YN6OfbvmIvMG3olR/GYfdQWS8g0wh5LmYPPm6fJTltNHQioAZMDBXmyTqjgCI4AyGJBU1VupV4qXGpzpVVqBe5i/KIeaZSr+1aFusN/ijX08r3wTbSDGTn1jkskpHSUfqSHamluuIZ5XwTqJkJHlZBxrBAOHryuRrlCsvmQ8Ql3o9j17XUl9dpBEoQIQuaNhezB01GfCDyHrFrgLHP4BRL2+jvhMgimaZD57RyHXRCUxBCP5ySJ7TQLQxAHAj6ZXP+22za5BcehfBVPwD5Qq4/ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39840400004)(366004)(136003)(396003)(6486002)(26005)(86362001)(4744005)(2906002)(6666004)(38350700002)(66476007)(38100700002)(66946007)(478600001)(8676002)(36756003)(956004)(66556008)(1076003)(186003)(6506007)(6512007)(6916009)(83380400001)(5660300002)(2616005)(8936002)(4326008)(316002)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5zBTcvfVOWPuyGHr6bLy8Z5fm35U6NnBCo+XS+pwVB0xZ+ZFL3EGXfOSFozv?= =?us-ascii?Q?MPB4nCGB7QFlDDqVXI6Eq8KxNZ66QkLtA3rvFwTSwUIr2z90kP/LjV5N3kEH?= =?us-ascii?Q?AXPnW/t+KB+8HMbAgyTZA5M/y7kQ/ACGOXZ905l0pq895jOnv9qSmN2zI06o?= =?us-ascii?Q?gJXU9EadtEaWUGv4TxkglF98wKMHRAkGjab9AEYaoHNp2nBj4JWGfvP/IncK?= =?us-ascii?Q?1VDA2eLztyjctdl1ZeTfFFFl8xGbLiURwMIw6/x5bwwC797RISAjI5T3o6M5?= =?us-ascii?Q?gpY/SidQXmMI9wlivj3ZlpBYGSdgMjLL/vBBEaSKjnGCwlHAeDyxbqQ3f93D?= =?us-ascii?Q?UgKB8VL8aqU20/DgKlQ8Wk1x6UOPhha+pz2DtnPwBjEIsQYqV4fBJA8XSbRM?= =?us-ascii?Q?5mrr+sv4mxJx5UOZPJNqVJQIf9Tr7jZH3ufbw+3B/4mBz0jk3Z6eRO6tRQMB?= =?us-ascii?Q?KW0zYNI6GzGUQGgKq2ZZghE1DNM3zAMY59wwjSNCUnpxKqrfXdYj9n+zMdQY?= =?us-ascii?Q?xN8z4oXQaWqiU0gC+tuxzrQgqtq4DC07a9YFo5IOCoM7XurEY601DdBa+7FG?= =?us-ascii?Q?2EzWq5Bi+xD512/yMLDI5BgUImJ+GL81NMyDCRrQIRvnQVhgG07qm+Z05bYT?= =?us-ascii?Q?enmsCu/L80nXsbOQMw5Pw3uevDdfrts1+RX1YgRjzWguY8jXkqi/b3C0BYNS?= =?us-ascii?Q?f2Sal6nU5CaPYggjlhVHcW1Q11EeGdh9Rq4GcdAy4/NGGOKKl3QOLCtGl8EP?= =?us-ascii?Q?orW+Hlajg1bbXtucY7/DMDdEoITK935tRwjoUUNpjUKbJokowxdSrFgbCOim?= =?us-ascii?Q?tvJzlD7cMGcKc4j0qXhC0Cm2+qE45q6GmDnNJSIyQXFNIUmgbEIpC2ginWgd?= =?us-ascii?Q?8IYjBYP72zp0WgGVv8tvW2ybmrkwea5F7IBQ9ftK/36mj1fGYjlzNPqyI9Gi?= =?us-ascii?Q?k0knXs/jKk0cbdy/84sRQ5DrssvTfOzLA1sl5GlZpsBGgJMdoeW4o07vnKnZ?= =?us-ascii?Q?D1I5MuvYiwaXt8eoaHi2j0YNp3rH24Gim+Q1wD5FNddSg0QD3uFVxomfNoAq?= =?us-ascii?Q?cswfncEzPpGntsPpBPSviX5gJd2wP0cZF6OsyADIBcShK6UEqgxf6QKGAOIR?= =?us-ascii?Q?mIic2FlPdFMQBgO9EAVWFKJPTSZCSjdWuiq9Xsp5u9TWwzaxPdvGWmuyQrh5?= =?us-ascii?Q?SBIzHDkgBaOJSFEmMHCDtHJnSkMb9l7HIa3YS5HmXpgrSgNGj9jvgAROvu1X?= =?us-ascii?Q?c90+SNFfz5PwQRmu7gWW5agonrlJP7oq89ycCENVpCKge0AYuF4C5G5kU3kC?= =?us-ascii?Q?6/kd5rYzqU2rTotxsIuOuMot?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7ef1485-a087-4b9f-b7b2-08d9776a1826 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:20.6668 (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: /fxd93qSnbCVWc6NKndVuZWTmDudLNIFzbFVemxvrS8l2sy71M5OIITx7Bds1One7iMpz+HETeRr9l9t6MXreJhsAq/ZwbG2kfdle5n4ZPY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6071 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.115; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631615969275100001 Content-Type: text/plain; charset="utf-8" _qcow2_dump_header has filter for compression type, so this change makes test pass with IMGOPTS=3D'compression_type=3Dzstd'. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/039 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 index 8e783a8380..00d379cde2 100755 --- a/tests/qemu-iotests/039 +++ b/tests/qemu-iotests/039 @@ -142,7 +142,7 @@ $QEMU_IMG commit "$TEST_IMG" =20 # The dirty bit must not be set _qcow2_dump_header | grep incompatible_features -$PYTHON qcow2.py "$TEST_IMG".base dump-header | grep incompatible_features +_qcow2_dump_header "$TEST_IMG".base | grep incompatible_features =20 _check_test_img TEST_IMG=3D"$TEST_IMG".base _check_test_img --=20 2.29.2 From nobody Thu Apr 25 01:48:44 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631616137; cv=pass; d=zohomail.com; s=zohoarc; b=mSovWRkXRFBSne9hUWrKIHPNBI1Vv9UM1DwHEZCLSHb57p1gRyZvUbNv5yZ8V0OlJ2FxnuZ1eUCNGs+SfydAozuj5+Kl15MCAslaxNboHi8MHJA2xkneTREELlArYwY1a5LSoTqQnSj/64W+NHfnwcmFVjnzu2br8mMvV+llMRI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631616137; h=Content-Type: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:References:Sender:Subject:To; bh=1gAEGzacDg87dFaLFKvXy2ZbAwFMsUV1qSooLYZJMIc=; b=OGTkpvTZDdY6rEiym7gpsXiPuBQCoUpAc25IF/Y5/CXAz1tJmqe4Vtci1D/o128QicwJsJ4Sx+ONcIVsHxcf9YdMZAO+0RqOx9Gi4PC6QDEG4aqV6PULY8HNazx1V3j2Nd2Cjx9rZU2nnhMiWfxDQrSux8EgdP9xnJYglbKbkH0= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631616137164180.7840249605016; Tue, 14 Sep 2021 03:42:17 -0700 (PDT) Received: from localhost ([::1]:59554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5tH-0006nG-Tl for importer@patchew.org; Tue, 14 Sep 2021 06:42:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5e9-0005Ky-1D; Tue, 14 Sep 2021 06:26:37 -0400 Received: from mail-db8eur05on2115.outbound.protection.outlook.com ([40.107.20.115]:20224 helo=EUR05-DB8-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 1mQ5e6-0003Ok-SI; Tue, 14 Sep 2021 06:26:36 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6071.eurprd08.prod.outlook.com (2603:10a6:20b:29f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Tue, 14 Sep 2021 10:26:21 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:21 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oTCYoCiXtBbaJjGB1dTiy0DcxYh05bvLe8KdC53mNTwn2LUJvg8iVEJ2b/KrUnwg9Qvi59XBDyUa/6YlyReLp8SBnnCCp7i8cDo6KLynf89nqwHrIAeoXLoABADh62qnaK3g7dGAXjQU5t9PLN5ylJeI1jOg06pWtLOsL46di0qSI5YueGmy5d3G/w52pPyx/wlCjwtvTJTNpZugYwqVc9t6BwAkphrF2LN7eOz2SGkSyNIfIXcUSToMTL71rj7DE3SHPfQ0WU2bbu17s7WxLdRHC2SXdE9y0UdtGLlgcJucYGQY22/QagTwoDR1KAdXbkELr9gFxYeCI4W1MdOXmg== 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; bh=1gAEGzacDg87dFaLFKvXy2ZbAwFMsUV1qSooLYZJMIc=; b=m9VDOpfDUcgwoYo9qWYmcBH+nwZrQMiZlpVjApPNDuOHgr7s6vI3/3aptroO6cI5pg8boqTFMqYVY9Oc2Kad9AmYrvpOwu9meVjKC5aAvq4UEQmRXCO4aaQH9ApthuGNsHU59fKXSdo4HD8pYmiQd+MIC1U1njhRkkd1oH7UEIEOOPyGG3PskVShUDiAc9QpOT42zYMKNV+bY7gq7FguvNsdslgYWKzmJOLfloaQHyLxk6oQqyZZy3ngb6SY9moqU1CXWoYhs9CsZUY8se35XDvmygu2Tmoj1QzyiLLX++W/wd3r4Vb4qCn8Rj71MxanXuilme1xzrK+lJkfIbb3SQ== 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=1gAEGzacDg87dFaLFKvXy2ZbAwFMsUV1qSooLYZJMIc=; b=kxeasRO5JlRJ0e1tNbBfdtFmeDwcJ8sDXM9JfdY+1VYxzdYfTlxJd73YjI3aRFiIqkQ8eQl6e/YF0IhDGWDd9VzS0u+iPrg2VmkvOYqaEe+hjYbjxIsk/MgVWf0ZhQboj4+o1ON5uULra8AXKV8N0XWX4ebrCc5Yw07PykgIZLg= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com Subject: [PATCH v3 14/17] iotests: bash tests: filter compression type Date: Tue, 14 Sep 2021 13:25:44 +0300 Message-Id: <20210914102547.83963-15-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 02909d2e-131f-4286-bdb8-08d9776a18c2 X-MS-TrafficTypeDiagnostic: AS8PR08MB6071: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2201; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: asDUj1xjSTzcLrqemA+gEabz4NCB6rnI5JuTlm7ceoryE8VwFct3v4E+GiUfJIbmqN5Y9RRyYej7GZ+l8FPFB7SUttH/nCt/vUTAvlnYgrRTRd+ZavVDY9s92Ht6oXb+W+oDLlQONuhLrkj/1DT4U86Q8RThyPJtfvNXQK5Cne8NGmfoeXQl18YuygdflSXUV/KjOkfjQLqQLERl0mI0sxu0dpGlfWKseFVKU0F3IP/XLi5wnGueeGl6lyvMiu4LTYAQo6L8HOj0J5wiNkThTZuq7bXq2w6odccB7jWthnHsWknuqrQmcketRRQ+15f9s681DP/qmUUkWrkCFOIpY4puz0r9Xko3Nn6Z/o9m2PvDOo6xd9M9soFORdsT0Ao3/dlJ2BojgIonbCs0SRmBlq4MGUk4VggMWliHrhBw7HcpyYoLAm7xDKtHDhdEoashbW8QVapF+wKCjNZeIvmt51uqyJjVSpl5KjpkxVJSR5vH497PFptaBam4dq/W2jYnzGjAVvbbgfl71YOkXAkQN4bfGoaR8VETuOnGoVlteyNz5QqK6sDAXCqxJbWtpD701U/jFunXMEsVfJxSbTjenkFAud+KAedtwS+f8AI8gNU8GXunwDUIxbLtq6wOvBdXFUHvIhP411hok+ndhAd1U0jRdwKj41QnqPvQnGXuCV+wNVQ2l8dtOtkH2nx0WiUjiGi3xIzYYPNvv3sFeElmkA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39840400004)(366004)(136003)(396003)(6486002)(26005)(86362001)(2906002)(6666004)(38350700002)(66476007)(38100700002)(66946007)(478600001)(8676002)(36756003)(956004)(66556008)(1076003)(186003)(6506007)(6512007)(6916009)(83380400001)(5660300002)(2616005)(8936002)(4326008)(316002)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TSwnY7SgH9f8viMU6JguisEbsY1OE+GYR/afWJtxeKj17FdoptH6lx3waSkr?= =?us-ascii?Q?eGRsBNAxTH/PQ3qvl0H8UH+1ATz23sjRdQmFmeM3jBASYUUhBrh+ZsvLKhHb?= =?us-ascii?Q?A+Wyy0WP3nZ/Oi7iQtmn5l2MJSO2xpseQLn1/N2vnJmqcHOIzkYkCplMUHjr?= =?us-ascii?Q?jE9ATbN1Vp3BoAmoHY06Il0wdou3S2fbpUluHmSd+l91m6XYALgBYysgv64L?= =?us-ascii?Q?YEhP71fF/tpTtyLoi24RMVJx6afSz8QUstuTLCH9Ls6GwNcYpa2YGYeAd1R+?= =?us-ascii?Q?bIafG8YhKJe5HC8KsoXa2HLkw351hsYqaboaqX34uzwOYUeuMvRd4CZ31/B7?= =?us-ascii?Q?ty1bHop3GdZuJPgPp3h8yrcizkYkGeNDKqU61NnfUmB5ZtvomhSo+Bv8vzT3?= =?us-ascii?Q?wc5UVi8GZawSSyacn03NvTzM1IeKw49kKN1H+gSnmV1xDU0/CBEH0vHs9loq?= =?us-ascii?Q?Hw27MENZ8UIKSn0Q46GaMGBKqkkjx4483z6hr14bHNC5+bLFcYMq09FBKXlR?= =?us-ascii?Q?ZaOYV5sXmZqFOzdbwvJB0Woslo+A8KS48vjtsH30v/jZ67nihRiAWdPihB0r?= =?us-ascii?Q?z9Qir7nLhwpXv1cHuClsdZj0u78x296TMR4cbRpPEM829SRMyrU+DX0YjZaj?= =?us-ascii?Q?rpzlO5EeXwbiB5v6qm+p0pJJsiSSG+4dTwLEhFgn/7wfhghCcFJHTFOfdJml?= =?us-ascii?Q?IgTsriwbe59HttFOVB6nhIOy9roncE8wAllg7UanULx3XR/V49qU5t6DdaBR?= =?us-ascii?Q?GX9+geOIBlJzD0Uov2WmMVVKHGAxXgwN6AbJeND8lhegB1G5XdxNSSqvNqwL?= =?us-ascii?Q?1nxZ/KI+hYdnjZcBJUMfPlnC463JNxYTBoJLlpjIlwQsgkSFHQW1sj9ROLnW?= =?us-ascii?Q?XA02LwYh9hxQexC67ZLOCn+on+9rIse/T35ibaw92/H603ZZsZ/kJC2OFAuB?= =?us-ascii?Q?Utoo3Anx5N40JvpX4A3wseFPE2hyETJnCBsObzNe/wv/3Dxtp0qiPH9maXrQ?= =?us-ascii?Q?KSSIsp2oAh6jmdxJTP8nttI/Tzs7m8hYTCcGBswkeuCdimFH8/mcrcseK2Rt?= =?us-ascii?Q?3ta6talotQOMwrtjp1hzLtN9D9IdMzUGJP/85ich3qYQr8MuJuM61lfmeyDt?= =?us-ascii?Q?dtaWzOnCGXEF1azPuRYHYFo4+biOww7uU3ENedA92O3o0AS8zdARH0q7LcC9?= =?us-ascii?Q?7uVrV45BjQxM3eEwmN02Twpv8EGU2NZi3bBRfnnerzIGhgY7UyLEB/Z5lFFX?= =?us-ascii?Q?jmDLMuQ44Nn6/ma6XKWihnVO+HBsoJfs69bCC8FF3cIEoiKaQ0220iEAg4xa?= =?us-ascii?Q?5KwgA2lMFn9bbDFqEuzyTZ8a?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02909d2e-131f-4286-bdb8-08d9776a18c2 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:21.6923 (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: VFqpbCpiy8ngVyBFYY9aZyUcdGw/htzFg8M7WM59FtOb9Owlw1PxqtlVtUSugmEJCjGltmuRGGRyrDVlo9Zez6SUU0+b+669FNGCFIq+5AU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6071 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.20.115; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631616137499100001 Content-Type: text/plain; charset="utf-8" We want iotests pass with both the default zlib compression and with IMGOPTS=3D'compression_type=3Dzstd'. Actually the only test that is interested in real compression type in test output is 287 (test for qcow2 compression type), so implement specific option for it. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Hanna Reitz --- tests/qemu-iotests/060.out | 2 +- tests/qemu-iotests/061.out | 12 ++++++------ tests/qemu-iotests/082.out | 14 +++++++------- tests/qemu-iotests/198.out | 4 ++-- tests/qemu-iotests/287 | 8 ++++---- tests/qemu-iotests/common.filter | 8 ++++++++ tests/qemu-iotests/common.rc | 14 +++++++++++++- 7 files changed, 41 insertions(+), 21 deletions(-) diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out index b74540bafb..329977d9b9 100644 --- a/tests/qemu-iotests/060.out +++ b/tests/qemu-iotests/060.out @@ -17,7 +17,7 @@ virtual size: 64 MiB (67108864 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 corrupt: true diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out index 7ecbd4dea8..139fc68177 100644 --- a/tests/qemu-iotests/061.out +++ b/tests/qemu-iotests/061.out @@ -525,7 +525,7 @@ virtual size: 64 MiB (67108864 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 data file: TEST_DIR/t.IMGFMT.data @@ -552,7 +552,7 @@ virtual size: 64 MiB (67108864 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 data file: foo @@ -567,7 +567,7 @@ virtual size: 64 MiB (67108864 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 data file raw: false @@ -583,7 +583,7 @@ virtual size: 64 MiB (67108864 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 data file: TEST_DIR/t.IMGFMT.data @@ -597,7 +597,7 @@ virtual size: 64 MiB (67108864 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 data file: TEST_DIR/t.IMGFMT.data @@ -612,7 +612,7 @@ virtual size: 64 MiB (67108864 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 data file: TEST_DIR/t.IMGFMT.data diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out index 077ed0f2c7..d0dd333117 100644 --- a/tests/qemu-iotests/082.out +++ b/tests/qemu-iotests/082.out @@ -17,7 +17,7 @@ virtual size: 128 MiB (134217728 bytes) cluster_size: 4096 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: true refcount bits: 16 corrupt: false @@ -31,7 +31,7 @@ virtual size: 128 MiB (134217728 bytes) cluster_size: 8192 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: true refcount bits: 16 corrupt: false @@ -329,7 +329,7 @@ virtual size: 128 MiB (134217728 bytes) cluster_size: 4096 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: true refcount bits: 16 corrupt: false @@ -342,7 +342,7 @@ virtual size: 128 MiB (134217728 bytes) cluster_size: 8192 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: true refcount bits: 16 corrupt: false @@ -639,7 +639,7 @@ virtual size: 128 MiB (134217728 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: true refcount bits: 16 corrupt: false @@ -652,7 +652,7 @@ virtual size: 130 MiB (136314880 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: false refcount bits: 16 corrupt: false @@ -665,7 +665,7 @@ virtual size: 132 MiB (138412032 bytes) cluster_size: 65536 Format specific information: compat: 1.1 - compression type: zlib + compression type: COMPRESSION_TYPE lazy refcounts: true refcount bits: 16 corrupt: false diff --git a/tests/qemu-iotests/198.out b/tests/qemu-iotests/198.out index 3952708444..805494916f 100644 --- a/tests/qemu-iotests/198.out +++ b/tests/qemu-iotests/198.out @@ -36,7 +36,7 @@ image: json:{ /* filtered */ } file format: IMGFMT virtual size: 16 MiB (16777216 bytes) Format specific information: - compression type: zlib + compression type: COMPRESSION_TYPE encrypt: ivgen alg: plain64 hash alg: sha256 @@ -81,7 +81,7 @@ virtual size: 16 MiB (16777216 bytes) backing file: TEST_DIR/t.IMGFMT.base backing file format: IMGFMT Format specific information: - compression type: zlib + compression type: COMPRESSION_TYPE encrypt: ivgen alg: plain64 hash alg: sha256 diff --git a/tests/qemu-iotests/287 b/tests/qemu-iotests/287 index 6716419da4..aab03fb973 100755 --- a/tests/qemu-iotests/287 +++ b/tests/qemu-iotests/287 @@ -61,13 +61,13 @@ echo echo "=3D=3D=3D Testing compression type incompatible bit setting for zlib= =3D=3D=3D" echo _make_test_img -o compression_type=3Dzlib 64M -_qcow2_dump_header | grep incompatible_features +_qcow2_dump_header --no-filter-compression | grep incompatible_features =20 echo echo "=3D=3D=3D Testing compression type incompatible bit setting for zstd= =3D=3D=3D" echo _make_test_img -o compression_type=3Dzstd 64M -_qcow2_dump_header | grep incompatible_features +_qcow2_dump_header --no-filter-compression | grep incompatible_features =20 echo echo "=3D=3D=3D Testing zlib with incompatible bit set =3D=3D=3D" @@ -75,7 +75,7 @@ echo _make_test_img -o compression_type=3Dzlib 64M $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 3 # to make sure the bit was actually set -_qcow2_dump_header | grep incompatible_features +_qcow2_dump_header --no-filter-compression | grep incompatible_features =20 if $QEMU_IMG info "$TEST_IMG" >/dev/null 2>&1 ; then echo "Error: The image opened successfully. The image must not be open= ed." @@ -87,7 +87,7 @@ echo _make_test_img -o compression_type=3Dzstd 64M $PYTHON qcow2.py "$TEST_IMG" set-header incompatible_features 0 # to make sure the bit was actually unset -_qcow2_dump_header | grep incompatible_features +_qcow2_dump_header --no-filter-compression | grep incompatible_features =20 if $QEMU_IMG info "$TEST_IMG" >/dev/null 2>&1 ; then echo "Error: The image opened successfully. The image must not be open= ed." diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.f= ilter index 2b2b53946c..75cc241580 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -247,6 +247,7 @@ _filter_img_info() -e "/block_state_zero: \\(on\\|off\\)/d" \ -e "/log_size: [0-9]\\+/d" \ -e "s/iters: [0-9]\\+/iters: 1024/" \ + -e 's/\(compression type: \)\(zlib\|zstd\)/\1COMPRESSION_TYPE/' \ -e "s/uuid: [-a-f0-9]\\+/uuid: 00000000-0000-0000-0000-00000000000= 0/" | \ while IFS=3D'' read -r line; do if [[ $format_specific =3D=3D 1 ]]; then @@ -337,5 +338,12 @@ _filter_authz_check_tls() $SED -e 's/TLS x509 authz check for .* is denied/TLS x509 authz check = for DISTINGUISHED-NAME is denied/' } =20 +_filter_qcow2_compression_type_bit() +{ + $SED -e 's/\(incompatible_features\s\+\)\[3\(, \)\?/\1[/' \ + -e 's/\(incompatible_features.*\), 3\]/\1]/' \ + -e 's/\(incompatible_features.*\), 3\(,.*\)/\1\2/' +} + # make sure this script returns success true diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 5dea310ea0..9885030b43 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -699,6 +699,7 @@ _img_info() -e "s#$TEST_DIR#TEST_DIR#g" \ -e "s#$SOCK_DIR/fuse-#TEST_DIR/#g" \ -e "s#$IMGFMT#IMGFMT#g" \ + -e 's/\(compression type: \)\(zlib\|zstd\)/\1COMPRESSION_TYPE/= ' \ -e "/^disk size:/ D" \ -e "/actual-size/ D" | \ while IFS=3D'' read -r line; do @@ -998,12 +999,23 @@ _require_one_device_of() =20 _qcow2_dump_header() { + if [[ "$1" =3D=3D "--no-filter-compression" ]]; then + local filter_compression=3D0 + shift + else + local filter_compression=3D1 + fi + img=3D"$1" if [ -z "$img" ]; then img=3D"$TEST_IMG" fi =20 - $PYTHON qcow2.py "$img" dump-header + if [[ $filter_compression =3D=3D 0 ]]; then + $PYTHON qcow2.py "$img" dump-header + else + $PYTHON qcow2.py "$img" dump-header | _filter_qcow2_compression_ty= pe_bit + fi } =20 # make sure this script returns success --=20 2.29.2 From nobody Thu Apr 25 01:48:44 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631616409; cv=pass; d=zohomail.com; s=zohoarc; b=kCMDwSFYmZWNoD/if//MuAjYauY9BpkFh90Wz7yrGwwPQ49/qGJDQBFR0NBY7LaM1clFT1ekHL3jbkdpLC101kBtpmgcYSLk1afgYNvuO6f8bugHww6IBiz0oDSqBD3x0gAnndjOsEhExgD5lECKd2JGXwZuD8xS35nWmq9M6J4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631616409; h=Content-Type: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:References:Sender:Subject:To; bh=DflGnfCnKJ7R5aFFDbKXwyt7+W6Mg0/R8lONJLIquVM=; b=WI3XRTM7RHW7aNSjNI4Ku/HbLCbBf44tQkGoX8xMW9bEV08+3oE/zjayL21wGtKYMd/dqAqjhVRgWNvcdAonnvpDuETkajkvTxE16PyIj4eSiHYiVGSleFI/9kuN88mij4OWAx1J6ORG+H8bJKvh2kyuUsFR8nunTJOUUVTJOqY= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631616409073462.2830160880113; Tue, 14 Sep 2021 03:46:49 -0700 (PDT) Received: from localhost ([::1]:43124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5xg-0006LC-27 for importer@patchew.org; Tue, 14 Sep 2021 06:46:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5eC-0005Tu-8D; Tue, 14 Sep 2021 06:26:40 -0400 Received: from mail-vi1eur05on2115.outbound.protection.outlook.com ([40.107.21.115]:28801 helo=EUR05-VI1-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 1mQ5e9-0003UG-E4; Tue, 14 Sep 2021 06:26:39 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6071.eurprd08.prod.outlook.com (2603:10a6:20b:29f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Tue, 14 Sep 2021 10:26:22 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:22 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GPyqfxGb/HiwdnjXgv/8h+g97nL4UzYovAX5v49XkTyzC4vLxYxxnAnLaVjDIWHW4rVzbwW39f1vhrpocZZAbFU+NNS28dkH4Iv9HTBRQJ5EWspBdKtbIzMmkKWv7vhXkSRode3mBxcxoK6fGoA7Ro4ku8RMy75dud5IPr95on3Q6WztpKi4Vojk9TuGKRJHTsc1wfmZonjkcPWVgqS2nBBy6JVrklmRxkLPoIzK9l5mPeGx9seE+JeLvpezO6PbosRc1O0/Nluj7HpIrMKFTezfRl7QrpMD1yi4xj+7CmajrBVKgbMy2ca4NEkCW5x4RzdjnZl1/yDlqr9roD00sg== 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; bh=DflGnfCnKJ7R5aFFDbKXwyt7+W6Mg0/R8lONJLIquVM=; b=GYgX0/hvX/HaRbJKkxjMEq+WrDzVMjDQm6VNHKxSfHofKVKJVc1zXxC59ZTKWEqrqhYlMeqgWY/1UN//U+9tU9XpcrGNEwUP3Fy9clNhRaHip5+aN8RotmFqtnQMCVmU1MRrVyl6mRe1zyRqR+w00B+WQVsaGjAhzin/oemaQxGdgaONdQI6qFRSw8bwkXlky25J1KTSoKmB+xhA5uR0yxT9js7gCxxL8SyEPim1rqB2Kq10pUOVCZFwUMuAgANoS7ksvLULyscAfpHocMGVZVDA07WJoFOnVDbW4lEKn5WUsY1+peupUfdga6jjMS0W3KeeWj7Uzezc9TIKgs29Zg== 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=DflGnfCnKJ7R5aFFDbKXwyt7+W6Mg0/R8lONJLIquVM=; b=qbrx9Cpu33/H9j92ca30rzmue8/kjYRYbX8BSJZKloWn1fdbCMI3Nw/b/+qrV117SeHjHVFBSPo4uG5nIt+H+nkt3PK4cxVvz9XmZie+kh5aMOxFGjFblklzCYeneb9eLlf4oDiExlKLbJPqvfKDAeoVSKA0Xg2met56GynSpew= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, Max Reitz Subject: [PATCH v3 15/17] iotests 60: more accurate set dirty bit in qcow2 header Date: Tue, 14 Sep 2021 13:25:45 +0300 Message-Id: <20210914102547.83963-16-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 41a7d10f-570e-4ec4-9d53-08d9776a196a X-MS-TrafficTypeDiagnostic: AS8PR08MB6071: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:256; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8h436gTCThAiL5B653sXMAQr5g8tCRTwlTgQhGZOyud3ByNNWw8u/cXhfMAlkidBkYAd/u/tbUz8jF2DxDGjUh0GC+8x4xDnxxcpYig3mOCLlPnYNvWk4GVcrAbTs8n7xCVuGqlV2cQh5EEVlAOAGGHhNWCX7WWCKrflH3K36tLZqCzJfD4A8GuTAETQD8Ewv7rzDdKZgXSBM8loffk1QQIaADzRykjN1vYVTBvjIeZcBmQvaXfhxmOeM1aBMVphBuGVv8j4vaIGIWD0XeoBkzXk92NKukA1mG3raybAgvgA0QYIoljuDcmQ2f5hoL9DBnlJrwB7UZq4qhzQQjw9vNPzak1b73jcx6076uM/ZPE/vnpEcIeCvJLkHTX0axOthNszdaHsj9OpZpDBqE0tZ62teGkjeYQOcQ2n0zUGtZ6Yd9Fw+nzoKrEq1P5q6Y3sUUxFAAfqbBMb36JaCQS160aiVBKnOSlCwtSiYYJbMe159amFtohvp2iKavuSi3ZW1lImYxFrjfVufdlv8TLk/BChseUbMAXMX7bno+IDKO7IPTXXXz9EsklUp6F1oeLWB2vcW68ipyIVyhipOmmUPaXcKhEIOK12QeHuFmwBkvY+/xRsFerrw0QDjNZ6KPeuUhh55g6u3FlEX4z6cMEPMwL2epXJMqD0JMwpKybJCZcxRLkWGmMUwBr4HrzZKEXHYFZblT4hnCNosLYx0QksOPwChYYoJwMKV9YXRdxzzLM= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39840400004)(366004)(136003)(396003)(6486002)(26005)(86362001)(4744005)(2906002)(6666004)(38350700002)(66476007)(38100700002)(66946007)(478600001)(8676002)(36756003)(956004)(66556008)(1076003)(186003)(6506007)(6512007)(6916009)(83380400001)(5660300002)(2616005)(8936002)(4326008)(316002)(52116002)(14143004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hl3xvqiVscmBTuPplkkehfPkkgmdwHBnbLhhc+HAHZ2KqaufxnhiTcP4bAbL?= =?us-ascii?Q?ZSJj9157FQNo+sDD0aHdxRDllE3MYohfFrhfO0H2246qKWb8KmuwM+C22DKQ?= =?us-ascii?Q?YdCmD1RXnVCeft7pccZAkG39m4m59N/zeZ3fiYQmsDUkypU4BrpFxJFjNT4s?= =?us-ascii?Q?ijBim/gUV/KsEXTxwKAQCJr07dCWiOY0V+P7hubUsEL+7vSYeLJ17kshpNlc?= =?us-ascii?Q?XR6A3W4WfouuEEBhQEakUMkLMzJlI97tOifGYs/nFUz3T20qiRUhevqf2oHA?= =?us-ascii?Q?eJvf288O1jEQlfR/9ump8c6y97u7U5POez5lvz4tehkTf+Raf8N5AE6Kxao3?= =?us-ascii?Q?F9ZJVuuZ2JlcWBix6CAmUVIdSSh75y+/ULZJ3i4Z5MXrZ8mYli1DoMt33fEV?= =?us-ascii?Q?T2oJp1Gmb4bN++JuXJ2NdBMukVv3zFKdYYbI5XhfvZTBuTIuBLbNKXqYoS7n?= =?us-ascii?Q?sD1jy5vMcou5psLs6dKCaDfowspBqWYmYqeMlhO/P5XsjfzcaOaqFQdoAdbq?= =?us-ascii?Q?ShyoBk047LmiBxcrE6qo3VWKZwyD5GuSI0n/Tk/AsOHSabmWjSPwwtn2EDlM?= =?us-ascii?Q?PVl1Poy+ghaXP0Q6tlH7TXGqjj7XgxVgs2lHePH6VGJsPs5nIRgeawhxDN1s?= =?us-ascii?Q?2vUXUqg2Rdj3pXi09tNwKxn+o5BIf7cKBEd/0Iqw3kb5br+mvbjn/QUYZ2PT?= =?us-ascii?Q?W+mhjSysaqTsTUj9JwGYiamIBpq0H31OnbU44xgzHe6ZM9GZLc3o6LnMi7Pn?= =?us-ascii?Q?29/HCm9MReZBtaT6Nk9CiNtJJlXPajA3aPU9+eRpOYa1Y+19ZoHlFiN49CWG?= =?us-ascii?Q?KSw+6XFQQXLB4D/xXIOIm+62+QbDG5C63k3AuGrnilZ6DRYvJ4k9vl5D7WBJ?= =?us-ascii?Q?4QMlBM4ZWDdY5liivBgm9hVLQej9IG12wv3JC9Ic0ANpck07WoCEHC0EEIOP?= =?us-ascii?Q?NmHB0p8pcAG4oTwuB18A849epZ0HbB04pFyP7UYRH/ipDvzWnpUumBl71hrV?= =?us-ascii?Q?LUHD1r0gXxCmtIDJnO1SD1LucD0pE1myHUDM0mGvhDEVpEgzY1T5cgMX8SYG?= =?us-ascii?Q?ACUG0FGY6hqGFsMeHBRhXXlt1ik9pBilGx14TmMSg0Ak8O2plM7bpI5qEv+C?= =?us-ascii?Q?5Q30Idy1myWgIlHv7hIwe6w24p0y1l3ZKY/A8Z3VQ4Q+z+oCU6HuYLTcVwEw?= =?us-ascii?Q?RS/mk0AUkbHjJbwNVuy+m2nzQZttcW9JP36acH3c16bk/MWnYmRA5EZtOWOl?= =?us-ascii?Q?VAguJTXqcHkH8+NHga50jHdEDn7W+ejhi9CWd1h0SpfnrgPSJ1mQpkPDBi/j?= =?us-ascii?Q?VtKv9aO8letu0FSXg3mDVZN7?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41a7d10f-570e-4ec4-9d53-08d9776a196a X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:22.7835 (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: RXXKb2bXnfSH3GkPaNrtIaMSKuehAGiVBjG2+k32P6XD8ftInFilZx+O5deiMv7QUmVX9UGEJ+dcNvH8NalVA8OAKpcNfO8Mvp/eWI08KCk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6071 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.115; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631616409554100001 Content-Type: text/plain; charset="utf-8" Don't touch other incompatible bits, like compression-type. This makes the test pass with IMGOPTS=3D'compression_type=3Dzstd'. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/060 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 index d1e3204d4e..df87d600f7 100755 --- a/tests/qemu-iotests/060 +++ b/tests/qemu-iotests/060 @@ -326,7 +326,7 @@ _make_test_img 64M # Let the refblock appear unaligned poke_file "$TEST_IMG" "$rt_offset" "\x00\x00\x00\x00\xff\xff\x2a\x0= 0" # Mark the image dirty, thus forcing an automatic check when opening it -poke_file "$TEST_IMG" 72 "\x00\x00\x00\x00\x00\x00\x00\x01" +$PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 0 # Open the image (qemu should refuse to do so) $QEMU_IO -c close "$TEST_IMG" 2>&1 | _filter_testdir | _filter_imgfmt =20 --=20 2.29.2 From nobody Thu Apr 25 01:48:44 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631616259; cv=pass; d=zohomail.com; s=zohoarc; b=Umy2kAxhcDcKs/wkJZAEYw1ml61KW3LrvVsWjSjPVvv3hVhTJvIT5un3qfwwEKXck7Xpor2lZjY/v0EpFM6Nknr1WtJaLHk7VP+GR43qgguTPfzvyWr44ECW/jnNcfCQlcxRLR9aIG+5iZR7HyG/T+LhvPq/0bKn5RyRl8HXFeE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631616259; h=Content-Type: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:References:Sender:Subject:To; bh=fxKaLB/XgD+NXm2hC62O/cmA6Y+0xQ9MU6xjOOr886U=; b=RuPmp+3xhB/J5XUbPLkFlll4QqASRXrykAQb0371gwmfrfXZOaeX5PPOTliFscG7d+kHqU5qS/nvXacAOfUcNf6SU2CdbOrEolEexJO/YpKmiae4zsX6I8NfbCq31SS1CWkIrad4ERNVmXYCSuaRU77yjlUp5PA+SHcBOn8MD8I= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631616259814926.4049210565638; Tue, 14 Sep 2021 03:44:19 -0700 (PDT) Received: from localhost ([::1]:37260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5vG-0002KR-Rk for importer@patchew.org; Tue, 14 Sep 2021 06:44:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5eC-0005Ua-HR; Tue, 14 Sep 2021 06:26:40 -0400 Received: from mail-db8eur05on2115.outbound.protection.outlook.com ([40.107.20.115]:20224 helo=EUR05-DB8-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 1mQ5e9-0003Ok-OC; Tue, 14 Sep 2021 06:26:40 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6071.eurprd08.prod.outlook.com (2603:10a6:20b:29f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Tue, 14 Sep 2021 10:26:24 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:23 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iKwQPrxECsqxjeC8uUxvaRmaEwJmWRzBrOhPT/sAsQmoWfgQis+6J4nOR+oNsbDEYLwIbooCDdnFEvD6LH33BRpBwwvjbLPRBW5P7Q6JBX+we4B1shwhAXg3Ahzq+TGOaTWUiljwWoEXHOHkcIx6YCeoKxyytcBVh3/XJOavHQUrvWk84G+89LphVQT5NHlIU97+pJCYRwzdfnuiHs4g60Wlp5CPab5OQD9MTiShxG00lx8Id6mpRMh6rjtX1ll35I2FQJXFGOBTaOoQeghh5X2kA11JUqUUxxZblfCqSlLDfFdPG1VX2+WEMhUsWorxL/db+tU6eEBKUz2hQM/tMQ== 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; bh=fxKaLB/XgD+NXm2hC62O/cmA6Y+0xQ9MU6xjOOr886U=; b=jtDX7v7+xEw8ZldUnsVZetmeEH5OKs9uUd+0AEkV/pzt904dTydzin+RJu4+DTfVwUCHaaDONErTGaxqGHw3SOUIA07L77p9DzeoGUcHbnq8RY/2fb8b4F+Z1Xoz0ULOswGTF12NLqdkuQqTM+JAYFg/rJ4nmBR0RoGNE+Tialk8gY19JmOsZw2EwJXao3zt/a2a2mDJ0nnuWfgG2bfO/3qdBck698eWt0JEYOzkqKv9ariVgTqemawIMMFnLY4rParJxX05OQwnDcRzE2siF/JZXoUhxWXbptRbZM7hOIoHJaSJNCEysPNp8vSozXQpJpp7/wWIE+LZL2iipcvY+A== 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=fxKaLB/XgD+NXm2hC62O/cmA6Y+0xQ9MU6xjOOr886U=; b=XgN6IIOt5wSKr2YgCRoxI4wKbJdP8KhcmeKuX3SWAQWcOAyGRvraPc85Wwm/bNDCtTrt0wMNRsULZUV4yp4Wcz+3y0qCqSpJCeJ13bjYRvXg2j3fZSx1efwIznEpzDgI4m/vVdbTRLzv/KWkjD1++9MPsC4ollq19PhYR8UvVBM= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, Max Reitz Subject: [PATCH v3 16/17] iotest 214: explicit compression type Date: Tue, 14 Sep 2021 13:25:46 +0300 Message-Id: <20210914102547.83963-17-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f41a7643-7e44-43e3-c0da-08d9776a1a0f X-MS-TrafficTypeDiagnostic: AS8PR08MB6071: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3513; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OtGVqf+zO7z3jmipCWdxmyttujZTgWyGGZxU7Wzv4vm2PBqtwOSuMy2/hrL7GmXW3HFCjVirC6BeTdlzTJ6ynMF3czqMD0CrQzOub5HI2Nxs01m94inDoYHxOV56fvAL0MrqtTy4Rz1HBh11UKFQF3QhWXjlBxzFO/81WitJTH4+ED4Q/JT+UNHwEfv/5AWgjtBitwgxqsY1Mg2QgvAOi0utiiyRNaohS5HysDsschhByle8ryfbLIc7D9hIlR+ljXBhG9GTBtWXhccjcxZzWvPBwkIpRF6xZntfWoK00jPxFfN5J3d5i32UrSf4aNOzgZwongCkHNWDcKSJgFjJbGKdrVVP8CwfGiV/wGEv0OIFTrLTBqyQSKlZMzQmz7jnLD5UjnK18jDft7mTHuU8R+2k3OuuI1DWyUuJNBtjcnpQ99aZb9J9spEIe1vOpbwRCbtVCEVfKurtL4SHpwRsOdXUmgxOhsRRkbmuBh1/rQmOy2O9NlZMnixIVu2/GpCB9Tpd0UlVc7/CcR4eAdNVkM6EF7IeAYv4jnxD1LSaev9AANmqpMAF0W3koF/hLMCuzTqJj5xGrvYfke07X5nXHn+QzqHRJgFJz+DWbvJWVs/4Caht5bT3babUb+WkEwPBbCor9gHqX+jtzB687hYzYhdmhfjh1jSonF5Bqv+BZ4siscLIE2JwYOWqivg9TKSr X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39840400004)(366004)(136003)(396003)(6486002)(26005)(86362001)(4744005)(2906002)(6666004)(38350700002)(66476007)(38100700002)(66946007)(478600001)(8676002)(36756003)(956004)(66556008)(1076003)(186003)(6506007)(6512007)(6916009)(83380400001)(5660300002)(2616005)(8936002)(4326008)(316002)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UbD82UUKbVRP9F2+haP6tH74ajRD4nkfuOBKC+I3UAVpjmhHhDReQdslO/at?= =?us-ascii?Q?jMDQKTG4GuVQqyxHwYMbODT+LykZtE7y54T4k07fPusnnmzNYyuvaL7pLG70?= =?us-ascii?Q?12qUW5uBDU0xYscFG43Q2EI82Nwkxu/Cu8aoF+Cv0BUWuQzOGYd/tkV8hId1?= =?us-ascii?Q?zUPrD/0e0YewdGdx/57UENWXy2g+Jlr86cURMyBERUY+t6rxz47oCXyAwL0x?= =?us-ascii?Q?ZmyJJY7d5hc0tLz7DsZtogUpc9Ks5KrobDOWp+2FyjXATGKcknZUNEpfA8Fc?= =?us-ascii?Q?WZNEtxVfHEj615qjLUM8cHqN1Db+G8F4/4U35B7BCfAVPYEp/uK8B1OrLVKC?= =?us-ascii?Q?kq/p1LArjvJp+pXqRIKljFX/pDkvdE0h/Ur3q2e/yjhAhwbS8qco3hP1JLnW?= =?us-ascii?Q?Tr1V7UrNedKZrUO0DoDF2rdQu1KMHb5J9NcGUWvwCZm0q03yjXyC/xhnCaEh?= =?us-ascii?Q?lvefoYA9nlqxixH/sI43G7gXpURyRF3VsEjfkgjdIKwRdvrQMbInKyD4R4Bk?= =?us-ascii?Q?/Zt8iLyIf9xsUC2K+J8X6dhga2zVSlM7yrHzadbZ8wkLdiib26kuwGcd+OpS?= =?us-ascii?Q?9YnY4jNZDtcNxsUrzdGuADYbdGYOo6Kc2HtfLKk1or6CaREpCfP6WNftmjR9?= =?us-ascii?Q?hLCfjMb3FkGhEsGPLVHRkCTyKY7O6Gk4QsrJaJPZOlAaHJQ3xPMCMKZuiO0l?= =?us-ascii?Q?lRxXe7SM+xsKSgF2lqZgSYRy5ewiB1ja3KXw7dd3j4rM+Qi6okSiCkAgQNsO?= =?us-ascii?Q?Yb1ZZ0m4nutiXQojkCnm6UfUd7BfJVxVU9mFlfdnvvxBYFG8YgBzs3jSNimJ?= =?us-ascii?Q?wa6TS1Y6BErOOQK4WJMsRuPjslhobppOdRTT38JPZALT7ncAEsXqGzZRI7Rc?= =?us-ascii?Q?xVaGofyfbbIModjCMVpelqhu29Y2xJMUZeYfVAklzwSZC+2TqmKjIc9n0yZr?= =?us-ascii?Q?LFtNP2o7EI72rN3FBHS9MLOL3pKfNVW8KDF8Xnfzgx0tnR3dZ3le3BxRgcWi?= =?us-ascii?Q?5OeG1AQsKAtzYU637xsHZBdh1rOl/D0VeJA9kCjb+obFrxehK8Qqw3DKzK6p?= =?us-ascii?Q?DeCkjjhMZpvgq+Rakk6XFzLi6UN2c41cZlE8Ksq9M/G4QU0Q49DB1q6n4JF6?= =?us-ascii?Q?8UK1UR3HIES8kVTaoz1hwCCx2jGsh72Pp8GpwSDsrBiuTG/DBOHnb8V6cLoK?= =?us-ascii?Q?FZV3ZRNt0tJGbDYshPz1alKqsPk1M5Q7jhsgGRjHf7sxbfxCAvQm81uXPdk0?= =?us-ascii?Q?aRVw2/nyqqNoq9usL/pPsIecEccK2Be7be+wxONxxzBjCMB6rnBUMr19+5ys?= =?us-ascii?Q?uU6wim+xsjag0hYMDB6pZ86c?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: f41a7643-7e44-43e3-c0da-08d9776a1a0f X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:23.8578 (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: Hu7RHmlxt9w0qtQHYoVq3xez7wJeNakKCvN5KHt4CrOgJPQAb+VP493uSp3NBZmc5JDbE9RND/CzWS/vPhRj2IqIlVZkquPE1MrNLsXkYSE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6071 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.20.115; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631616260458100001 Content-Type: text/plain; charset="utf-8" The test-case "Corrupted size field in compressed cluster descriptor" heavily depends on zlib compression type. So, make it explicit. This way test passes with IMGOPTS=3D'compression_type=3Dzstd'. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/214 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214 index 0889089d81..c66e246ba2 100755 --- a/tests/qemu-iotests/214 +++ b/tests/qemu-iotests/214 @@ -51,7 +51,7 @@ echo # The L2 entries of the two compressed clusters are located at # 0x800000 and 0x800008, their original values are 0x4008000000a00000 # and 0x4008000000a00802 (5 sectors for compressed data each). -_make_test_img 8M -o cluster_size=3D2M +_make_test_img 8M -o cluster_size=3D2M,compression_type=3Dzlib $QEMU_IO -c "write -c -P 0x11 0 2M" -c "write -c -P 0x11 2M 2M" "$TEST_IMG= " \ 2>&1 | _filter_qemu_io | _filter_testdir =20 --=20 2.29.2 From nobody Thu Apr 25 01:48:44 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1631615823; cv=pass; d=zohomail.com; s=zohoarc; b=VlXG0jH+WJgEaceXYMznebeK58xNMChmsPrn0F8jxprGP7hjT0eTHQWcg4plZRdEnaXQ4oexYFVKvpoyHMcfMSIjMDWCu08uicsFl/5Q7fzrOv6Twi4G+udVhWIpoUq9MAq2OnnPvijsjYM8PoYDbyQyRzcGl/V7eSRpx6fJ/IU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631615823; h=Content-Type: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:References:Sender:Subject:To; bh=WoVjZHPrt+ZFKeQkw9jQvuFcBAf4TbeUOc4aJBXjDHE=; b=QSG2VNRw+gCJRofmziH7IFkhI5NTvs27TtWuvZEzXe+KcXFDQTz6eZ/wtBFvK6enhrUxTSao8tPmXn9caMIcr5KFMs5aYkEJIWduCSM/uJW1C3Z+1Zv5zzL0bkuO1nTsa5a+XTC0zEyHiuR4oYT/i88wmdTUm/I6Cqe4wWnKOU0= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631615823149533.0372411148313; Tue, 14 Sep 2021 03:37:03 -0700 (PDT) Received: from localhost ([::1]:46748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ5oE-0006YZ-2g for importer@patchew.org; Tue, 14 Sep 2021 06:37:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ5e2-0004yT-E9; Tue, 14 Sep 2021 06:26:30 -0400 Received: from mail-eopbgr70094.outbound.protection.outlook.com ([40.107.7.94]:64463 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 1mQ5e0-0003Zb-C6; Tue, 14 Sep 2021 06:26:30 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6053.eurprd08.prod.outlook.com (2603:10a6:20b:292::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Tue, 14 Sep 2021 10:26:25 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 10:26:24 +0000 Received: from localhost.localdomain (185.215.60.196) by HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Tue, 14 Sep 2021 10:26:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FpIiRParl8JGfZaTGM80pgvgyxSymYZZNIlT3HCsLZIpEpP2VXJumPE6hzcQ7z21i36UiHErAvZFk9tLZ4yQk+9/RCSTa+HvXAXkwngdL/sDnVbwd9J3e5ikTY+GPgMAc2OA/XmZEHGqVnxovhh5gQusqItAHQ/NIb7bqJkNiZPTYCzLixS/6utwrqFOG873KP4kvJFjP4JH5/YHAx3/t92ffR+v8CwxBprkngRvwCr3Rs4AO8IFYEQO9Dg5UHLJiq4V30t499rlSWEn/gfzk1oJfZNH0NigjOIfahMZcHwlB4yEV/QEJ8htm+WfCh3KFp1ejt42mv4Utw1xRBjnrQ== 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; bh=WoVjZHPrt+ZFKeQkw9jQvuFcBAf4TbeUOc4aJBXjDHE=; b=QueYcxAjV3e6uIQ7vZdbVxyW3PSy6C4nP7maj9JiBQMmFTSdehF6JUUWBPIBpJhc4GgUjCsc5hY75nK7cngsdjtP+H7X6gX/JZA2iAsOI3K36H6GjJcuCGicbjkIweuwCagjWqxdbq7SN3dTL9EQOoQgu5ltrKV25nUkVA6FZc94mMYa4LuUHHkXKUwNKWAU63iDB7g5/pO6LnhTMJD/Ie6iXjjt0O4A74pTh7wCJdVkkNqnSZmwpngvNLipp4PObCCumJiRJ+xT3r0YW1NOE6/T+9cny2vrI1QUi52Szv7zsSIGUgDwFSNrVfJrWg39EXx+6sy/u9TCvirYYoH1PA== 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=WoVjZHPrt+ZFKeQkw9jQvuFcBAf4TbeUOc4aJBXjDHE=; b=G6Y4+bwD+B2bblC9rTldjMJpalpzXRB7x6ybiTlWj3ozzD9Bd25I7bx4gF999hxpUCTf99KEZowbnbI3dGBiowQG9A5ZL45KGV3qtpE+xcHxayhcbZZYSFScqeDy0krKnMvaBTdN/Oky8hY/4wKzFHpWjmzV+03At0rA6viiFvg= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com Subject: [PATCH v3 17/17] iotests: declare lack of support for compresion_type in IMGOPTS Date: Tue, 14 Sep 2021 13:25:47 +0300 Message-Id: <20210914102547.83963-18-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210914102547.83963-1-vsementsov@virtuozzo.com> References: <20210914102547.83963-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HE1P191CA0004.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7abbe3e8-46df-4f7b-31bf-08d9776a1aa9 X-MS-TrafficTypeDiagnostic: AS8PR08MB6053: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L6fMqhpXFvUHKxAW/DDwL/BJeN8lG2hVkDv3Oths2I9jFuLs87MTO9S8YS8vhoHB2tWd2ynVgt6h8HbU4ON++bd4C7LnCbYK71578AFMLsbmqrU8TdzvQslYfO6lvtQUmV7pQyGb3cHPRz2Boz+rIdtPHyqK2swNZ6cQHcEihXSsj4AP9ZYhcjm1BXdsVU7S0PxIkvwW95SMeTy4vFcuwrhrEcXJQubAkC8fHd/X9PZHv+JwYpPsg/ar89VP/+paCKY1P7ezLuGeHNQdyT4LaQG9LGhgs93UGCZEHNbo0Ev/ofkQLSajYgwGZ8rvU6oHhUY3EaZuBzRXGd0CsVjt+22iN6g/ZhxNixkC4J3eoaDUJIAT3jU0x7TtuwnPCtXOVoPbHI0WJ5z8TAiNRO6zZA92XN9BeNf6d/7otADfV2ZM0DKjrtvLiQYv7FNJazIYW/p22xLhkoF70DqztoNFEXPvttcqQjC27Uj5QeCFE4sUeqFhWRmw6/HpDW0FeF/aMmn7RrsSFTl+7qjT2zUdOECgqdZ+o11GJIZf5tIca+vaJZinytB6BbcM8ZaGjC/RE7lhnstqGKguUlJAFD05YyDP3TymywdSuAAQ/vUSgj2XjwGpcodgaJcpq5YZq/K5Fo1ew6IzPStrUiEqUBZn1qX6gSidgc9v4X+3WX51rS7Hszdn+wKtQu+KnvCTw84i7T/8h5jwjKAtCvB8AUNF2A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(26005)(508600001)(66946007)(83380400001)(8936002)(2906002)(66556008)(38350700002)(316002)(6666004)(36756003)(38100700002)(86362001)(52116002)(66476007)(6486002)(186003)(5660300002)(6916009)(956004)(1076003)(8676002)(2616005)(4326008)(6512007)(6506007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?D19fjSvXvDqRFilZgiLqoAdMG2FfAnLsc61Bi1+BC5sU+jEbJt7QH9+mAhhH?= =?us-ascii?Q?+bG9HI+N2sr76xAz8e2ILR8Rla0K0kpHy2X621BmNYlTZawnU/1pjkF8rEJJ?= =?us-ascii?Q?G9waVV5/ZA0YMFNqFugKfzFKSdqyocRS9qt08E0XD4p9K3LuewgPR9vm67WH?= =?us-ascii?Q?CSrQb/zgNFQcW9iyFvyD1mjBAZpHkhS+2Yj8bkLrBbGiUW9C+z/0yRZ/J6DA?= =?us-ascii?Q?hhMGKczZB8cQOtXnd4CNL0MQM5as2pX2IZbRlUqNJndTAwCI6I4UKQYFmcEE?= =?us-ascii?Q?rjnYTwlCWKNOVK69IiMTFibMXTlNRXKO7frX7u5gc9JHdFOjounu6R2JNLjx?= =?us-ascii?Q?XQ1VVM3u454yBO24xTy+7nuQUV0I+bPtebZmNQViljNHoHOIev5Gz8JqsayC?= =?us-ascii?Q?oGaY4fKv8fNAtyW7p6Z6kBd4r+4nOm2iVlIFtxwGvmhlcXavnDPwt7iwJ35J?= =?us-ascii?Q?nZdfH7EqeOdWI30dSlazjPSO07DAoKkYkVHCei3/ylvjT99pxTRBQ6IgKG6k?= =?us-ascii?Q?498bI1coYQhGzbYCKb4mFc6wabgtKk+lF+30DEPGssNDmDsDlQv6J1lMN4OM?= =?us-ascii?Q?ZMTKlEs/edkAbIICrhL2mjFk+jGRdvyWa1SV2QvdP0C1n/t7OqC/bGShVxzj?= =?us-ascii?Q?QwYj0fI3Oa5Ymtk7m56D64npStfJ85ufkp8FMCrbRtf4k7dQj5/gIQIGXvSU?= =?us-ascii?Q?M6mxZibIiXNX0HgU45sWzHY3So74ZNT/GgK8NmDSxr2BmwG97v+3v8GvuSwQ?= =?us-ascii?Q?X53k1ghQh8NwPEvHourKOZrPYBXS1waPg32ABmYJ9K4NcyQkdp+3DHwsizBu?= =?us-ascii?Q?ZFgv2rMjqALQeuZ0eq+mp2yT7Yq9HljLwRDJyCWOVVIAIJSDzpNm8TBEa4GF?= =?us-ascii?Q?+TYBv1UEbFEdrCUv/Luj8BLR4qodoqkMiL8hP7OMX/d7nOYbY3kOVcWXjEVa?= =?us-ascii?Q?4ylOMqRXwc+00aV9kZ5aYzhDiCnpZw2i5uX2HJa3ANs4iVSZMA9aaAK95bQ4?= =?us-ascii?Q?MsSPbTSH9LZaB6J61B8ktWudQDd0LEka/0z4Gq1GHezoYECsAN1njVfBkVAI?= =?us-ascii?Q?FURRZRGElpCDUzsWRjG+FfSkJWizG3jSEcU3rRAkZg1fKRpMg19bthaBWFV9?= =?us-ascii?Q?mqhgtUzBX3qTelwirCuwyp5eZAl2/0ymX/8EzGDnBvnImK+HAo6WbSWkSDCr?= =?us-ascii?Q?OTMzz6gMMFaK9auZxE38w+MYacU0LQuX7912FKfemnn6YXK4iab6s3bQ8dwT?= =?us-ascii?Q?Sakp34KNvUB1GgiFcIAY6oxAKW80JFzRUYkkpo8y0niSCnjThhD/XTl1vE7g?= =?us-ascii?Q?LgtOUTcEOZVOxZVvI8NTkdp/?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7abbe3e8-46df-4f7b-31bf-08d9776a1aa9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 10:26:24.8574 (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: WdzBmyM1+WWE8tqS0W4WpHLji7ku6nCFeGjm3VVL3wnZPDHiiVX38bW+Pfz6PlXWGXbU2EMvzr0wc5PqmGOFupUyNEdEPCV0HhUfEUzll60= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6053 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.7.94; envelope-from=vsementsov@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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) X-ZM-MESSAGEID: 1631615824946100001 Content-Type: text/plain; charset="utf-8" compression_type can't be used if we want to create image with compat=3D0.10. So, skip these tests, not many of them. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Hanna Reitz --- tests/qemu-iotests/031 | 5 +++-- tests/qemu-iotests/051 | 5 +++-- tests/qemu-iotests/061 | 6 +++++- tests/qemu-iotests/112 | 3 ++- tests/qemu-iotests/290 | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 index 648112f796..ee587b1606 100755 --- a/tests/qemu-iotests/031 +++ b/tests/qemu-iotests/031 @@ -42,8 +42,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file fuse # We want to test compat=3D0.10, which does not support external data -# files or refcount widths other than 16 -_unsupported_imgopts data_file 'refcount_bits=3D\([^1]\|.\([^6]\|$\)\)' +# files or refcount widths other than 16 or compression type +_unsupported_imgopts data_file compression_type \ + 'refcount_bits=3D\([^1]\|.\([^6]\|$\)\)' =20 CLUSTER_SIZE=3D65536 =20 diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 7bf29343d7..4832000fd5 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -41,8 +41,9 @@ _supported_fmt qcow2 _supported_proto file # A compat=3D0.10 image is created in this test which does not support any= thing # other than refcount_bits=3D16; -# it also will not support an external data file -_unsupported_imgopts 'refcount_bits=3D\([^1]\|.\([^6]\|$\)\)' data_file +# it also will not support an external data file and compression type +_unsupported_imgopts 'refcount_bits=3D\([^1]\|.\([^6]\|$\)\)' data_file \ + compression_type _require_drivers nbd =20 do_run_qemu() diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 index 70edf1a163..513fbec14c 100755 --- a/tests/qemu-iotests/061 +++ b/tests/qemu-iotests/061 @@ -48,7 +48,11 @@ _supported_os Linux # not work with it; # we have explicit tests for various cluster sizes, the remaining tests # require the default 64k cluster -_unsupported_imgopts 'refcount_bits=3D\([^1]\|.\([^6]\|$\)\)' data_file cl= uster_size +# we don't have explicit tests for zstd qcow2 compression type, as zstd ma= y be +# not compiled in. And we can't create compat images with comression type +# extension +_unsupported_imgopts 'refcount_bits=3D\([^1]\|.\([^6]\|$\)\)' data_file \ + cluster_size compression_type =20 echo echo "=3D=3D=3D Testing version downgrade with zero expansion =3D=3D=3D" diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112 index 07ac74fb2c..5333212993 100755 --- a/tests/qemu-iotests/112 +++ b/tests/qemu-iotests/112 @@ -43,7 +43,8 @@ _supported_proto file fuse # This test will set refcount_bits on its own which would conflict with the # manual setting; compat will be overridden as well; # and external data files do not work well with our refcount testing -_unsupported_imgopts refcount_bits 'compat=3D0.10' data_file +# also, compression type is not supported with compat=3D0.10 used in test +_unsupported_imgopts refcount_bits 'compat=3D0.10' data_file compression_t= ype =20 print_refcount_bits() { diff --git a/tests/qemu-iotests/290 b/tests/qemu-iotests/290 index ed80da2685..776b59de1b 100755 --- a/tests/qemu-iotests/290 +++ b/tests/qemu-iotests/290 @@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file fuse _supported_os Linux -_unsupported_imgopts 'compat=3D0.10' refcount_bits data_file +_unsupported_imgopts 'compat=3D0.10' refcount_bits data_file compression_t= ype =20 echo echo "### Test 'qemu-io -c discard' on a QCOW2 image without a backing fil= e" --=20 2.29.2