From patchwork Mon Jul 5 09:15:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12358595 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E03F8C07E98 for ; Mon, 5 Jul 2021 09:18:19 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 844A961369 for ; Mon, 5 Jul 2021 09:18:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 844A961369 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0Kk6-0005lv-5w for qemu-devel@archiver.kernel.org; Mon, 05 Jul 2021 05:18:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0Ki6-00026V-4i; Mon, 05 Jul 2021 05:16:14 -0400 Received: from mail-eopbgr40109.outbound.protection.outlook.com ([40.107.4.109]:55110 helo=EUR03-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 1m0Ki4-0007tK-3Z; Mon, 05 Jul 2021 05:16:13 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IR0EswusXv75WtMah2PW/QydcnNoYTMUFztDVtlwAftuhKLXrceyWLsho97ThzCtWvVlac6C0jtknedC+VN/c2/jFMj4WzkUbMjX/08CfovQYySeloFQJdZZZWZ/2gZ+3BePQaEQqnegvqRoVQuFk2qFi3DIKy2UND9/Wz6q/dcyNANgEtGnt92pTvKNIW5qB26vOepGDmAaqRxH6n6UA073OArMLo4rnynclbId5fqMocqN7iMakSq4m4e1tK9Xv+1TdYVF/f1ehMxdyvcWt5BCHyY7tOeyxUIT6P/79nSU9nK4DqDhiucfUb3UuimTLAZXQ8Xhrx4w7mP8DWIlRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6quE5hHpYkk6WlTO465bSuSJvb7twXFdvnrcct0mFTI=; b=mpY9JD43rXB5Dh2JqjiBqZkW4I34w2j6tCADaHP7dsI5DtRkJLFqs1feN4Rm/2mZvX32An1Go8029SP5MuG4zRuoXzX2l4X/2ujvrrmZe4Ez/QLVvrIy7n2kScoUcVkJKJAQIZjz+g5kpQpZu4SIztGUGFFrGcbLkV8sZQ5oVGQD5DBY5v/ikWo0OlklqqxEJz0YnbT0UMiMGWGypVbSRr51pQHzaAcedhYJK+oZmRgc/D+RON3DX7onjUCt3FmnxWU2uQBEHCv080gnCqD0mvMzV3FZ9HyDFi+aIZxFmyE5NmZk+apWRPyLcQwU3lE8SDctr4vYlH/Dv3PCzAvDfA== 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=6quE5hHpYkk6WlTO465bSuSJvb7twXFdvnrcct0mFTI=; b=VKWllncZb8ImQb/VDQtqi9ujYMC1rDTJgDg0STgX8z/KIFfeFaCuMJ9HUeRUp2L1CzF+0j66GFILYUbWz+nkSK/gp5VxFeF3E9UtKH0BbA+FKKWKgGrFMsfX6LxiI3+dAv0mPV8dtA20exN8MPvbfWD2926cQubCCv8Vf4AEpVo= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1714.eurprd08.prod.outlook.com (2603:10a6:203:3a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Mon, 5 Jul 2021 09:16:05 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955%6]) with mapi id 15.20.4264.026; Mon, 5 Jul 2021 09:16:05 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, vsementsov@virtuozzo.com, den@openvz.org, jsnow@redhat.com Subject: [PATCH 01/14] iotests.py: img_info_log(): rename imgopts argument Date: Mon, 5 Jul 2021 12:15:36 +0300 Message-Id: <20210705091549.178335-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210705091549.178335-1-vsementsov@virtuozzo.com> References: <20210705091549.178335-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Mon, 5 Jul 2021 09:16:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 02830565-41ae-419b-a7f1-08d93f958448 X-MS-TrafficTypeDiagnostic: AM5PR0801MB1714: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:400; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aiX3lnVAM3a6uKHcURyt8rV56OXMWGcEsls+WVp0RMyFZt6D4NNhyRcFDZRW7D7YJrbWhX35kfbVwmeFxwAC3nhUb2CaWy5I1penZCnOBBoxLCdYNURkLhwqwTVIsIOENF3PocohQ5qZlNGNQGUSIZ/N5FYsYZ1oZCXhEogjOO67yEmqEXaMZZ1bZk6j8Bwa/mD0hgwnkgdCUncun9QVBkP/p8DQmYT8mgkWGSTE+zx9Lq88LVrq9gTr9yxuLSesmC8p3DkzQMqdkipvxntEepGg/qnGhe+ti60EsU9Xlhpimp06Zb2bRnos5eUKhmVBIjbQAnZ+78Uf9CAWxZ7nlsBtQVUMRGu0kOl10EIxvRJrxxJ6RZx8wSgcl5FVyV1Dyz8NaVLWWCAw996yxtG2EPPyOZ2VC12BIGSU2YWuuCjk0nEA+x/7NAIuvjI8/TA0gNygtSj1WMu56FdOsATpillakgMQCZGErA70orzFvsos4TLf+WS60fAWt1DKqA5EUeWSWJfileF9Vi4P5+azEJLM+lwCu2XT0x3kdiqrTeKug1AB4vQnSqTZtsO6xwaGT7vVw11HkKqnIGdPTw6AVWxfNaZrfBnGE9hEe0D4CfRbxj1RpNi+8JMRBjai+25RGoP8BFq1FF5M983UdFmu+ZhL9O74mc8OtiJQOXaWVlOzUkoJGYTSECT+Y+1ApZOi2QpT50byMSqmEFx9EdGB/m6Sq1uL/0nEtR2+OdUVZXEY/csfVSUoA8zth0ImB31u 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)(136003)(396003)(39830400003)(366004)(346002)(376002)(16526019)(186003)(8676002)(5660300002)(8936002)(1076003)(36756003)(956004)(2616005)(83380400001)(38100700002)(316002)(6486002)(52116002)(478600001)(66476007)(6916009)(26005)(66946007)(38350700002)(66556008)(4326008)(2906002)(86362001)(6512007)(6666004)(6506007)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UszmeV88V8QXHYvzyS5r+WQ/zTiyva9k7oC9ci/vzUnwi3svERg9OcV/juR33GhAOWSsTZ+VrMxb0810NJPN2/06cA+vmTNPrqv6tAOZ1/UEVH2zmm4I/cietg6AYUNGZVqgtY5cGJxzNcyp6ESfSejMq33NSlC5EYjBJLIpzmK1NFNDy20ISfOEI6NQMdLmLRNKuW4OJBTPN9EK3ZL89DgdVDwjl80pPt4SR+SVBIbQcZ4bWKTTcAbEXUcXrjLfiSxQcTFmm85pLcY5aoSv7i6c0uv1m/xh0/tLrQFYcBxwOfpGRzEWz+O6ZVWy16kByA82b+dkiQE9iDct3XkAPqfJmzAMaoOmDy+pPoQd0tdlSO8ydnP7iHakxfb79l1xueM4mIqm8H5L7hIRk2RuI7wlAhjvH790H6gPE9C/l+okzOh6EHJ/TVo55kY0rPJeGvRD017t2lsGbqlA/ax/pESmIZ32ZTZfI0LkP2ngPOmAVoU7hvV6ApoG+T16U7R6CAjzQy7VtMr9NfG31+DDcQTPbNeRdYJV6gFrzt9SgSP79qHXN+7M1QFF/SQpYC8YzgFNeF88E1XGqgDRLg9PfyhtePBpadNhWAmI+wND0cKEwmSAVdPyDMhUPm7gFdQ4toXEeZ96jtftsiizmb9P4ZXLotfYAq8Urg/NKDOgPZnaOQF2Yy++1S4PIpr4HS40TZE/q34uixQ3g2LZyJXdEtJ+tsu3RCCciChRw1F83CiqGnP27zqDqRyECQVG3cuoM/NsXtSEIWDpnOErv/8hiaT+oDKySxDzcDrNr9SZJvxCLQuwi53D7zE5nf2bBmzWoSFfYsSNYYgKZxjtc+KHNcdBbxsb72wrtTkJH1R5ltBmjti5/8QMRt/1VcH0EQWaHK7CgYsiGoXMeI4V6Kc7EG9VFfAql+6Pr+hYeGrsfJKjdVl/6XYLmj9BSQBm7XYsKkrnSbNuGQ+AKWty5kJarQQp5RAnjC31yn7PrE+5ROKpbc6v5ey+kh0aozz6LWcGwGM0+b19ebSpakI+3PMRnFdGQ6t+DEfHYThRUWqUcE0D+GoGc3tKRWmlJFRl7VH692y2bTBfAGc50sJyVmkYl69munmJXBkLQzz7jfGpUdsiqwLkMLw2H3B80f53Sx1oTv9qoNnGuoW60kQQ3sZ9hpChidPPv5DcNvLE9gpfiqaI/SAbc8OEK5WOiSBOqo/33EYFvDxKmST5uR/T9DzL5KbNeRZeCtb/1/cvcRN99oPuTomfTeZDYjt5OKvo1vT8adQPh5ydvXSQIgqsCFWmv4npGHNcAuinMRPtX5IcVzTNdRdowBVZFJXGDEB6DbwM X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02830565-41ae-419b-a7f1-08d93f958448 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 09:16:05.3757 (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: y6EHOawbIsdYR5XcAZK5xzNOdgeztI/DhaRmNW80Qc4RsBV49SPVizpZXiPZs0qmdoMK0faQFY6Sz1jsu0rjdKD5YwWP75tEAobg86nil6E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1714 Received-SPF: pass client-ip=40.107.4.109; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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=luks,file.driver=file,file.filename=%s,key-secret=keysec0' % (disk_path), filter_path=disk_path, extra_args=['--object', 'secret,id=keysec0,data=foo'], - imgopts=True) + use_image_opts=True) # # Successful image creation (with non-default options) @@ -96,7 +96,7 @@ with iotests.FilePath('t.luks') as disk_path, \ 'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' % (disk_path), filter_path=disk_path, extra_args=['--object', 'secret,id=keysec0,data=foo'], - imgopts=True) + use_image_opts=True) # # Invalid BlockdevRef @@ -132,7 +132,7 @@ with iotests.FilePath('t.luks') as disk_path, \ 'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' % (disk_path), filter_path=disk_path, extra_args=['--object', 'secret,id=keysec0,data=foo'], - imgopts=True) + use_image_opts=True) # # Invalid sizes @@ -176,4 +176,4 @@ with iotests.FilePath('t.luks') as disk_path, \ 'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' % (disk_path), filter_path=disk_path, extra_args=['--object', 'secret,id=keysec0,data=foo'], - imgopts=True) + use_image_opts=True) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 89663dac06..0d99dd841f 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -187,9 +187,10 @@ def qemu_img_log(*args): log(result, filters=[filter_testfiles]) return result -def img_info_log(filename, filter_path=None, imgopts=False, extra_args=()): +def img_info_log(filename, filter_path=None, use_image_opts=False, + extra_args=()): args = ['info'] - if imgopts: + if use_image_opts: args.append('--image-opts') else: args += ['-f', imgfmt] From patchwork Mon Jul 5 09:15:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12358591 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC51EC07E99 for ; Mon, 5 Jul 2021 09:17:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3AF1661369 for ; Mon, 5 Jul 2021 09:17:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3AF1661369 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0Kjj-000566-DB for qemu-devel@archiver.kernel.org; Mon, 05 Jul 2021 05:17:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0Ki9-0002D2-UX; Mon, 05 Jul 2021 05:16:17 -0400 Received: from mail-eopbgr40109.outbound.protection.outlook.com ([40.107.4.109]:55110 helo=EUR03-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 1m0Ki6-0007tK-Rv; Mon, 05 Jul 2021 05:16:17 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZnmP5nwMixE+RIw3epBJGfqjeFPQznDkR/UmQRZHm7/XUnMZ6YiBhGuN7rf0CZneqQe6lp9vj4RYP+/MC6qbGdheAcPpJAf0NbLcFAvPjj5djZGF2s0iqlB0FxpN2WLizGyCBBY5EmmsbPc5JawnRgmbXFxDNw5/gWHB4+pLJohbO9gN5RDSiE/pWb5N35qry11g83hElesmri0GZbCUAJmi7G+IAzhssM42EduFb1XO96RAb23Mh7LrR5mmQwAHqzTCnJtMdRQLngrEw9ifAdHJ9toBWkeTI3nCoaPAJWF6K6RGQ9JldYEMp8sIpoOsN0JTvTRCa837TiPrMtUhqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vn/Q9EUjF8tZNjcbgk13L1zAUyXud+6boZ3K7XoMlcA=; b=kOlD6F6W+VPGKliFQ3Wlxg3Kx5Rp6IXRx/4XRW3vMITgoYJVKfEOg1eC+djYb4alMyBQWHOYyF1OTXCr4CXpLhPky8l8cl2+IwkzfI/FfEZFz2C3dHhDV3fNCtU7W/FvJQM4wortvEws+k08mx5NxJusTd85o4jv8LOD8Puion73RZhRwP7NiXBSDB1a2A22bTkYLvMa51oHP2N+qnsk77IUwcHss3vRmfkCHDk+tMUnA9kFh48w6YNm3mHKiv5noZy56sbHx+G05rr8IKtHDQRhcirPjTPANmCCCuNpP3augGiBwJVvxK2iTcljx1MJVUvN0+0fgywErzy8Ohm0mA== 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=vn/Q9EUjF8tZNjcbgk13L1zAUyXud+6boZ3K7XoMlcA=; b=wJMLyg8riDgxo9DGSa3Il5PFZBO6ewOWaYD9OEAXDzAleItbFF9mRrWVXxKd3xzvgOOD3bdouYZqQa4pJo1MlvZK6l+QkeUL9zdODIy/wpo3CoY2bYxWV0TbrlSrPVj8H1qdmdlqv2ijE4WO3hnllw60x7IxIcoa6JN0GE8+SJk= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1714.eurprd08.prod.outlook.com (2603:10a6:203:3a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Mon, 5 Jul 2021 09:16:06 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955%6]) with mapi id 15.20.4264.026; Mon, 5 Jul 2021 09:16:06 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, vsementsov@virtuozzo.com, den@openvz.org, jsnow@redhat.com Subject: [PATCH 02/14] iotests.py: qemu_img*("create"): support IMGOPTS='compression_type=zstd' Date: Mon, 5 Jul 2021 12:15:37 +0300 Message-Id: <20210705091549.178335-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210705091549.178335-1-vsementsov@virtuozzo.com> References: <20210705091549.178335-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Mon, 5 Jul 2021 09:16:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 921a0f60-6301-4a02-1d72-08d93f95850b X-MS-TrafficTypeDiagnostic: AM5PR0801MB1714: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WIXJRnsKaoDl+RisrX9z7g7w0CQxQeNkQr5tkzFEnPIDVV3voFNTeggx6XrhgbMP0jCYB8M/SJvPsBjkVagQGiZ5OpJmqQKH5AnI8t8FElo7NR+aYtvUrrhfBO4TjOfWqf5if+dxKycxiKMXkQeTjoorKZxVFjrS5pQKiRi8i4I3S/q7RrMQdDclbnboaWUs2aEcWCu9lvTujz2y94yu8azcaDPZTV5UzaDkhVKAPso/Ern3JzwNLmOltbj71psVzuYaTbt9ppj4msAmR5Nx7SA3CiroGhooYh/bH9SkINFAKW3YUDH8fH+QZbO61x/3K9ehVPIX2hMcIxYP8CHbRaG7R2uUI5UopZyPT+qQoUl5+5kC24aS7ILj3WjvOvxE0eHqJ5dtNQwsJ8yZD29sQqaTQd3KM0tjPf/xQy4arHDEmpDDZ4bi34d5oJQPzF+xIh6AbgkrzoEuEKpUsuFUPIBVM93aJyX07ScGF9YZfT3Ser5/H5/RNUAsd88Ki80Ae+EtY/9xbFhUg5q48lTKFIIsnLGpjmpnnQw4b9Nu3iFIf9XyU0sIwc1IdQ8eY0ADhOILyDbksu1GRNCiE/4iD4adqERtHwbahNaOAfo0Fjsj3phbc2qswcBKNFmcgK3pa+LqQouxQF4i38nzQrZ9Lj2O9mDL1LxZfkPcAU8thWtv+USs0IHCJRd+VviZRUppziaIhCSi6xqaTF06lrSHPmw/x8p6VRcnbOdluObTvKIdRCS4JQUBIi7CnXVvvjxJa3OnLsnNxNJVb36V0Jz3g9OOYGTb9tcxwg/Gsq0IsXlPDlRB/IOIaFTs4a/39PZ1RwNCYDYzWKO0Wz7jvwQl1g== 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)(136003)(396003)(39830400003)(366004)(346002)(376002)(16526019)(186003)(8676002)(5660300002)(8936002)(1076003)(36756003)(956004)(2616005)(83380400001)(38100700002)(316002)(6486002)(52116002)(478600001)(66476007)(6916009)(26005)(66946007)(38350700002)(66556008)(4326008)(2906002)(86362001)(6512007)(6666004)(6506007)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Zq/SgJcXEsQqy7dfyUbOm9iJJRXAgk/JJmO1DE1+PpcA+llEsSPPfMsTcXKKMS9XYIDlNRKOf0J6q6mGofvz7N68w8qtd8CHmdEIVoCsL55Ckaw1XGU1tTjoOO7ai9FCCzYN4r7KM4rv7/4/o5zF7Xkq8DwR65ADjtioknQfTTfDziThRAHY44l8KWemsYT227Wo7/n7qKMRu2l84fxTUGOryN/ooQybwpg0owuVVVgJxW5GveQb+Qe/PdHBxVw5xCXXIWRsPXSQB5XP23mf7jcv/7pftpBKUlayUE21nNNPUJ7RXP0ASAw+yn3pKQ03XoWR4UBSw4gVCc2UnKYv84pek7lzQAvhphR5dV4zZkl31qKPEa+PoSImYFR5fp0Rntqhq5DvUaEmu1FsqhTdOtX3FNQBW19MU/E09IlqBkDvwzC58X5zAea9ekn60vKcfRQr7GochwxZ4CB4sswa6U1jjZjZmBv4pqCSHHmXtaYiAZLOlgJCXtR7mLERk1sZOCMikjUcgHGNAVdzdc92KI9x1tHuECd9gQO5sxExS4iR5YU/pJJWO2VYalT3OkUjdUo5RV1Y2p063/0KSORSrdiokJXrNFQpLb5hN5N1cZGfcIdD1UNKXBFN831sFU0mtmIURhATn5aPcoIHssTiq5giGroPF+qf9jcGM0/CXGbHW+8HXaqXuW73txJYJX+XZzIZyrOq5itNIjaBqOtuoI8Ya5Rqyn6QYCo4THv5HO3B+VCQ+2zlkH9ekNMZmdNfxgSEJZmy9gmZZeAOMIgfui0ccpQ644rwkdgFPKd4yTtDJoGRzIjDHs8bKBtJVsb/ahdAN7jsQUz8bBHZ8x1NS3l4mpdTMdQ/aYqW+e/cnU79Gae1LUWD19I8UEvz1RVveeMxP/FhFt8Up+2vYv97h1M0yg9BQmXQTFA+imzZmHvPd3g0eHvePIC7VxrUm2ebNAoEelB/DpmDOL1rFQz+PBC1bL6HlnwJ9/FYMDHmEpAjwLHgW5lwrraIqx1v5FdpkMXFJK0XnTk6/1M2fsrU8Zv+dMFlQYh+PP0qSXrl9VG6lQzytpHaBh+EiPmgfH9NwRvlsJjqtLrmCHKr75z9zNaufkt+rxIIElZmIUBeWfB0U7WkHRAm5mR7GoDIoSPsuOR04smNCwkBM+4Mz7SmGXi3nyXN3ak46m3nqx613X/vEj+F6rOO5vYvRFvx9tvS8yE38tniU2EbuYW9i5MfPIc+aDbtLFitFVdvGh7FeJOY0uAXS2QashA3Yg/zRSt/p4tWphLrPEj90LDYWlH+5EXNX+5J9I8WP2GhB962EGXrWw3pF1oJzmpd94cX68ui X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 921a0f60-6301-4a02-1d72-08d93f95850b X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 09:16:06.5765 (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: akjhPrQMVhlci++4a/giw3SHk8oc/07xQTPWROQEEVu/zc1GK8rYd+sS3aRvgrX9tZ0nKHIgKQu+qpei0VBSICMk8C0+jtr+V679YylIQp4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1714 Received-SPF: pass client-ip=40.107.4.109; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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=zstd 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 --- tests/qemu-iotests/iotests.py | 48 ++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 0d99dd841f..80f0cb4f42 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -16,6 +16,7 @@ # along with this program. If not, see . # +import argparse import atexit import bz2 from collections import OrderedDict @@ -41,6 +42,19 @@ from qemu.machine import qtest from qemu.qmp import QMPMessage + +def optstr2dict(opts: str) -> Dict[str, str]: + if not opts: + return {} + + return {arr[0]: arr[1] for arr in + (opt.split('=', 1) for opt in opts.strip().split(','))} + + +def dict2optstr(opts: Dict[str, str]) -> str: + return ','.join(f'{k}={v}' for k, v in opts.items()) + + # Use this logger for logging messages directly from the iotests module logger = logging.getLogger('qemu.iotests') logger.addHandler(logging.NullHandler()) @@ -57,6 +71,8 @@ if os.environ.get('QEMU_IMG_OPTIONS'): qemu_img_args += os.environ['QEMU_IMG_OPTIONS'].strip().split(' ') +imgopts = optstr2dict(os.environ.get('IMGOPTS', '')) + qemu_io_args = [os.environ.get('QEMU_IO_PROG', 'qemu-io')] if os.environ.get('QEMU_IO_OPTIONS'): qemu_io_args += os.environ['QEMU_IO_OPTIONS'].strip().split(' ') @@ -121,11 +137,41 @@ def qemu_tool_pipe_and_status(tool: str, args: Sequence[str], {-subp.returncode}: {cmd}\n') return (output, subp.returncode) +def qemu_img_create_prepare_args(args: List[str]) -> List[str]: + if not args or args[0] != 'create': + return list(args) + args = args[1:] + + p = argparse.ArgumentParser(allow_abbrev=False) + # -o option may be specified several times + p.add_argument('-o', action='append', default=[]) + p.add_argument('-f') + parsed, remaining = p.parse_known_args(args) + + opts = optstr2dict(','.join(parsed.o)) + + compat = 'compat' in opts and opts['compat'][0] == '0' + for k, v in imgopts.items(): + if k in opts: + continue + if k == 'compression_type' and (compat or parsed.f != 'qcow2'): + continue + opts[k] = v + + result = ['create'] + if parsed.f is not None: + result += ['-f', parsed.f] + if opts: + result += ['-o', dict2optstr(opts)] + result += 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 = qemu_img_args + list(args) + full_args = qemu_img_args + qemu_img_create_prepare_args(list(args)) return qemu_tool_pipe_and_status('qemu-img', full_args) def qemu_img(*args: str) -> int: From patchwork Mon Jul 5 09:15:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12358611 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23953C07E98 for ; Mon, 5 Jul 2021 09:25:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A79FC610A3 for ; Mon, 5 Jul 2021 09:25:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A79FC610A3 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0Kqk-000425-ST for qemu-devel@archiver.kernel.org; Mon, 05 Jul 2021 05:25:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0KiC-0002Kk-Hu; Mon, 05 Jul 2021 05:16:20 -0400 Received: from mail-eopbgr40109.outbound.protection.outlook.com ([40.107.4.109]:55110 helo=EUR03-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 1m0KiA-0007tK-Io; Mon, 05 Jul 2021 05:16:20 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aM8utCXj5KxaO06h9A12BEW5cggtwEtbsPG+uAPDaGFWCXzv0cNccBCq8n+gUSKRUrtbTz6gsEI6S/s7rZJuUFKEZXckC+AKGy/2RxjM5EUo7dIE3hPO3cYjfumpc3fpBFx3IN8iWDibl76atrLLN88ibyGcIEHO3qGx7lpqF9J2HOSdtvLg1Gvy0rzwOdpnSSQOMyTNCjqz9DrpPmQU1Z9x7cNzCWrNjlz9QQMb8CsaZ6Jrrgsnnp0ibeg2P+41x5RQ1XcpRaUt/U2KI0Vej1HnwbkHEpOeIEn2QH3Vrk3XBXD4sO/tBrrcy/XX6yq5/Ci2Nlj2emltYafnFb4msw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GloUs7NER2I2fTIY3RgPX+Z/nh6DWXu6oQL5TK/w1J4=; b=fixgoUlqg4jR7XwKUNFqMDRbPV1C9nrm0K8rsw8FDe3gnHaTDO7DWYu4VwJI/krrhhzp8uM0d7ASL8oUSQN70bAvpUsYxBwTFEVXu+99ThB+7Mxs7OxdyCH8VCSTTPdAXWvFhvV8vAEh/s5/QZ70/fN8Rrt1SZ+uqy69PWYwhKWWTy6t3RaSNxs61KJGo9AsQblyIhTC7D8rzIES8a4MYCVDc3mbImABWK49XKFFYhBldULUryL9h6tH7JaiQtaFuABMhHosac4NiTbR+J69PT91/aFA5gD47+ED2umvdtSlGh84Xv26Gy72cDQJAcbzvetXEmwdVaSw1szHVemFgw== 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=GloUs7NER2I2fTIY3RgPX+Z/nh6DWXu6oQL5TK/w1J4=; b=YC+hXXEufGFUkd8p6ik3//y4A75XT1kwyuMIsYGJPvpe74/ln6RHU6fH1Q3esU+zov+COkMo2ShEBeHjjMZYm7MfvAtqJMogYlP6g+1is+w3OcG31G75SNstFJNgv5sz0fdKJ5ltLsJnsdrgjQwGS+KbEXb0I38T3mL9wfA89X4= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1714.eurprd08.prod.outlook.com (2603:10a6:203:3a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Mon, 5 Jul 2021 09:16:07 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955%6]) with mapi id 15.20.4264.026; Mon, 5 Jul 2021 09:16:07 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, vsementsov@virtuozzo.com, den@openvz.org, jsnow@redhat.com Subject: [PATCH 03/14] iotest 303: explicit compression type Date: Mon, 5 Jul 2021 12:15:38 +0300 Message-Id: <20210705091549.178335-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210705091549.178335-1-vsementsov@virtuozzo.com> References: <20210705091549.178335-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Mon, 5 Jul 2021 09:16:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 81c6ae9f-38f0-4afe-710d-08d93f9585a7 X-MS-TrafficTypeDiagnostic: AM5PR0801MB1714: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wTOV3IZulAZM+jh0yVCraUaFSZtA2O4cUg6UBUJMTP9MxNKJ2RR7Q/PDpJAJLaDxFQO5xNyyaMKW+cPYtJpgRQf0Wx23VoLG/MJQ/Mx7DupzayF5I1mOtl1tKyQUWFQypXrDxSBuYb3vyMuxZw/pSoR+Ol5zY9ed2b0yy58+rTaKfxAhPVbVV6fnGaiaFIxTme4k9gjI66ZGl8nn1n9veSA6CeTya7OBRhu6F3HKksYZrGLz7JF8lSapsZIq5IyPvYF6E0v5XfddNsVXHyL/1yCkw2mGIR36T27VXkiwXNXC3ITWNmWVb56M3td8e8VchvVRXt5eeZ6ANCxODs61XdJm7Mna6ATwSkfQEyCE0aKxI2xAnZaMNMCm+CWqLhs+BVheelfsa4R0PqcaiCsP9T7NIj4yk6w9NHy1Bydqmz/lYJzbi3kHcVcaUOiHLJfxKDGJc/FecdJTpLlvAw/CTBIiOjG5BH4EXnQV9DAB1tnWDOAgtlyBXK8fZU/Q3E4L6JuB50c90PRGRI26yWBqy89j3OXoDv3W9IU7k8ZPeCj+tIkPhVRN3r9fdgYyOmTGKp6yVubX/Ms8vM0JQBrNFcVJs9iNAvPbZ3+tdBe7CWQMfd03Hlq3drurwDfJCxj46fdF90/u40Fua3SuIT51nCH0DoVND1RoK+aaWlNRfpTKWzAqzk3XUg2sXHI2nyjDerm9PYsq4ZI6bceTmEaF/HV8+vwgf93VArh8fqcs52HhlhSk4Bq+C33AaOyn5NMqtGl/zpIR4O7Ijm9ESomkag== 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)(136003)(396003)(39830400003)(366004)(346002)(376002)(16526019)(186003)(8676002)(5660300002)(8936002)(1076003)(36756003)(956004)(2616005)(83380400001)(38100700002)(316002)(6486002)(52116002)(478600001)(66476007)(6916009)(26005)(66946007)(38350700002)(66556008)(4326008)(2906002)(86362001)(6512007)(6666004)(6506007)(69590400013)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VOi0kFIYEEAwFH6qfokJXRwJ/m8fSXcjklyb6hPGCStHKq+gKdoRcmOjIC9rGhxtt6m3fRgNYjTFNjcHzn/o1bgoZbPc9ctIYjB0XoGWaYAjYLHnFqQrG2vEIiGnr5I1XilKpI4V2XkreRilEwQBBMIAk5sKBhPkpsJB4KAv6HMTG2oVWhDjsSN8QIitCluFRkv21GCP50XG7sXcRVlf2sxZ/RmSXWfscdzIDh8sVXRghFQkReXs4kYHxLtjylBNIwVSUOxWMTapFFFLSvAig/V8yCxDIZM8l6nbFCnLrEtfJiPuYo1BJe3T8Ql1RJGgBkD4DsHmSFTSIOZClYzIMeSohNaI0y89WXF3/SYe4jGqVkJWo2Z7a7cRmWWeOWTWN3xLVOqVgfKbTJlIBAFBc2C9GlNgJIO9PtFrhXQunMDWMjc9V9YfNEY+MR0cffL1wrO8wYc+0YdJlGvt+v0QmvD5rT8fzLgW7+r7xd7IeazvYBwPEqNbudAZKAojM2rgBbUTl2yzppr1yXBpgbVN1l/I7s5rgxWtpqZyqttm5iV3dEv8um6jMclgFMhjhPMKtGV0iZ+fbTTq1lMje0KOAQzdBrVY6/lsf8NacjFu5SdyogzMERiHyDe1o6QkvNeNLv4nXTuZMx9NY5y500z+5HfTDXSRyhIT7lMXbeZ1ox+Vg+q2W9athl8580V2rovqzwJX+vWFPMRnF1mHy5XkgSuaYOSR3aO1IbO2L7L7E2DvtMia9mAyFmLIo8pI7pUt+pd8eGKHgUIT808rkEu13k4bMCdLecoJZ2IRE8HRA1CdVxU53X5WGXSTzW5nKDgXyoehawwlTs+v+MtKBkXO+3znmktpqygCRObn3uLPo16TJUyDURquDJep8+ONF6iiB5BoF1ynJ8z2dIm+iCMQIAKa5rpGK42A+vruc6PzRg0hcvy6Ib/lBMwO8lpFoxUianmowPAiEmz7TOlbq1H+jO20vnOLDZ96FfFBqYFC3/Z70nDt9n01v6Ygkofg7V5+WdDd6/NV8CAj6xBnttF1gHcAFkhEHgrNHvHb6B7nRs9+4WoPreGfLp0W1Qnef2CLKxR7dxfpktmCvxj0oj8aTl8V0fQRhhTlBIKauDZnGIaFVpygBNuU3zi74m0tHnYED9FFoYZI5/sMozWQcffadriAzbgC/8npMTz9EVmSlGx2NcivqyQeUdZpoOnb3IKxzZ5CQS/M2s28KSNOG3aKgMFxq68DtvUmhIR4xaGocQo5M3o/Mi+zzmYw58CE8joOcv46rSeuv4PPWl317pSSwUDBGz+KC6uffe7Sn2Y/mdC09EWxYi9Bxwot/5IwptgU X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81c6ae9f-38f0-4afe-710d-08d93f9585a7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 09:16:07.6189 (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: pLdVshmnyVmFcqn8TCzOkZVYf6UXfv/f1EwRn7Frp5VysYbGrFTGKXa++KtikARU7OsQShWfYGrc8qSYOvCqdeihBSPCUWlseUCWifD+qkY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1714 Received-SPF: pass client-ip=40.107.4.109; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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('') -qemu_img_create('-f', iotests.imgfmt, disk, '10M') - -add_bitmap(1, 0, 6, False) -add_bitmap(2, 6, 8, True) -dump = ['./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={compression_type}', + disk, '10M') + add_bitmap(1, 0, 6, False) + add_bitmap(2, 6, 8, True) + + cmd = ['./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 +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, From patchwork Mon Jul 5 09:15:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12358597 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7AC5C07E98 for ; Mon, 5 Jul 2021 09:20:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4F7C161222 for ; Mon, 5 Jul 2021 09:20:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4F7C161222 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0KmB-0002Rk-35 for qemu-devel@archiver.kernel.org; Mon, 05 Jul 2021 05:20:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0Ki5-000267-NL; Mon, 05 Jul 2021 05:16:13 -0400 Received: from mail-am6eur05on2129.outbound.protection.outlook.com ([40.107.22.129]:48480 helo=EUR05-AM6-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 1m0Ki3-0007yh-JX; Mon, 05 Jul 2021 05:16:13 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kUCRUg80BN77u9UsYSMWZdLky77Trr7iKSzcCnro3Fo3ChG0+n0MAudRMc1nH4drD0zQWyDZ5JoM9TzIDoe4R5+0xNsXCTzS6u4qS/9ZIfGdYhUY1aRLGpKr25/w7cW/GKNTCgsURSWFBN+wvhrj5ft9gTcPJ9ZqDTyfRZVIuf9KC/FVItP3DvPNKypv6MV4qlFw7nIpmLjRfWRN+6w0vOyC8Dp5kKuBC6+uG/PPtgs/iEYaGAbKV4SBg/t7DmE/V3Rhs9j+yd1jI20tHCaygWO0nJRT04Rms1aFy9Oc7Xx6Afy7qAd+ZST2/jBV13V1pxKLUmWLNMFT8XBixiU/2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vCSBNm6+0slCKwEpKDfYHWGBoUbGrfS93D1VZagP9j0=; b=ncGtsFjF8YdEVgeRMNiP1HO6M8HCbAZ+jJ1GtIFPejhAGbK6Pk3YmwBOuNO+33cG/V/sUPdHGS0+2hUlOrCwBW628490ELucYxdcYN44E4dScZsvOAWnyAvrgeVFQG+nKJW23ZJR4vgO/0/oc+cfqT1LZc3xriKsBz9YcKMWzguOQNbsTp5+MeqyFX9eoukmQr10cmGRUUq4x3Nvg+OyVv5JHR2IKThuTEJ5/y3M0vDDqLu3g3H/Xf8w1cISC8wUlJjQ9FX7GNfcpQdzsmNDZend5m2quIkUDFfWblrM2SwXLPpBgor6YKXRgBpjr+qLmge1a+3Q6qXYTN/oCeZdgQ== 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=vCSBNm6+0slCKwEpKDfYHWGBoUbGrfS93D1VZagP9j0=; b=wDw1mfn4sIaYYdW4FGK3S6puso8Y5wHmLdN3q3/feKBune49khJ7jsQ7YR2YAPD9gMSWQL4gy+Xoi4hnA6px7Cppnp5tOKzBGvnwM6eG8fhKkKAnTMBpCGVjYnwmksIwl1eqtf2hlHomqyXsfItxH7dtOEAzHw0Uff7EJqyVbjs= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4533.eurprd08.prod.outlook.com (2603:10a6:20b:b5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.26; Mon, 5 Jul 2021 09:16:08 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955%6]) with mapi id 15.20.4264.026; Mon, 5 Jul 2021 09:16:08 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, vsementsov@virtuozzo.com, den@openvz.org, jsnow@redhat.com Subject: [PATCH 04/14] iotest 065: explicit compression type Date: Mon, 5 Jul 2021 12:15:39 +0300 Message-Id: <20210705091549.178335-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210705091549.178335-1-vsementsov@virtuozzo.com> References: <20210705091549.178335-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Mon, 5 Jul 2021 09:16:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2df2e322-10ef-4256-76e6-08d93f958643 X-MS-TrafficTypeDiagnostic: AM6PR08MB4533: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2887; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f6V1FV39gXh/luPhy+OookcYbHcqQG0HAumG35V3Rz5sBBh6JR3UCTKPQbMU05vKQahXcqE55AZeQcQbs67nVEf3ldh08g9C8oFvxbUSka3cAExS2iopql5Sr3ZDP0d9dPQ3t306xVRGxDbG1a7yrYl+UL3Exgx0fSDO9J4MDliyzVxiUCPKSqFyJ0HKicyuuI66nnkGjmH3pqVbWVFBgNmpz+j9a5vfYcAuqOcPmmuH+HXivXaVDDIuAmO/qXT+qD+KeAxu38+yAvHOxK0xeJ2l4WhGijZipRn9JDzv09hqn1U6arZUt+/DtLvuZ1m9nAWIakLNfSWMMMQgfcGZihWj33QME81cN+37//7cSxksFCdvqdp9y0+TgxZO0AZQ0//esXJLpHiJYP5UwassG4RRAA4zJ+dhP/etRMtMMCjtY3iIaU0kt0VfqwWRFjAqpWy7NOGPl8B00FzQaE5gPA/8JWvWIX84M+phFne1YVZ4/8qOiILN0DfySsrrML8vgKWRlcSn5NaHfSd5CSB3tVXVC3cnU8PQwFKLk3ifXBYlSQhsTYhlhkY+O+NYe9yrTDrPROCSoG4eWnzUfaqSyo6BI5MdoBv5fn1T5bxZBGVOdve0NH38lodzocxzJlyhk4nEtQs/bh3pfrpFUxDcxcVkZ4ttoEYq7Ad63qUwZcvaxfBiVEZ+MuPUtxMrALfUFr0em3oTlOEjdnUSt2xRpL958SMbbofpX53SaxDNEu1b7y0yQJZyPVT2dB/wwHXM 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)(346002)(366004)(136003)(39830400003)(376002)(396003)(52116002)(6916009)(2616005)(5660300002)(66556008)(66476007)(83380400001)(316002)(86362001)(36756003)(956004)(6486002)(478600001)(6506007)(2906002)(66946007)(1076003)(6666004)(8936002)(4326008)(186003)(38350700002)(38100700002)(16526019)(6512007)(26005)(8676002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o761zSyzGUDh+YoZYsAivuOlUCdPNHjWdya8kBpj2lYthJK0dqsluuQyt4emWW3TTV6SScjVw53xvuOsYhoHYHUPnvFeSIBzVZqsQ+F9rs3Fy2Cbtf9x72iHfYqmga23sfxX1xb2BtMguru0SjCXOrU+rKTVIndMMTRK5qhXZDM5+H4bW57YdGH0Vx8tAsg7q0xkNz+tKxEd7gOzb2fVgqKZvwpP205HFjSTchQulRzyOKem7FqfgukEW8tCtDcVG3KfK2ZdkO2NoYXeY0NR3x3CIyxq57aTZ8AidPmhBM1SjFpy+YzGsggzS/KldNd2JFmAf393Oe7ApVIeiyz1z225EXMr84o9mGmdy7h3SZACeFkOClbQjJb2qEJyQ5xxfskS580OZk6X+CsZbKZ/vh6RgHyfrbJHaR4StG05kfcvF/4Z/OdVGX12dl6S+iEioIfsC+oLQZ7nzB9LCDE1gP5m65bT3KJrUE8AhNYXEwt21nB0y9peWAk9uAMljBBLysBGqlEbqJUvWD26mo+ZfRZMnwa4LVJVOn7G7FNJcGxAviB1sHFzZcFX8oJKdV6hgXgeDyxnW0nSS7uCQDooQCurPQT++x2dLU2NJdJhLLpDnWeMeVogojFge5lr2Oiq500VhWShfhkeWauFHmazwEsuL009pVov/Ve2m+PnnHeAAfDmJfUdA99QjI+u2hIKS30D8Xyx96d8JZAZHbmRJo525W5ldK2IWaqQYlTJAZnGofMaNx0FmTXJLnC/EfafZnhWPwp+UNJaChxneCG8w3ehzP+WY7Jpa64j1IxhjtrPmx5erMsHgWuk/yqSx5DvXHYyvS/KKXrT7sgSvt5d8JCfVcVJawy8jSSBM1DLCsjN0yB+LBMDGDfxURyoKFHkfPOCzW386IMra+SOTmef2nMrrjnIevBew2vFmIGcQuO7mp3UMGOj7Ol8y/W4jFOlNBzK8dwIF+s/W14STH4Ijy+nMMUR/Olr2iHLMn9XH0ZsLizHw9aFEcxcUiQIEdfsTaDZUylyy1+QmbdaFrvZhyklofcSNoj/9oZ7GjE60rar6Oc5GrK0J8UbW3gI0AKs4xYoL3m8KP5jZbqdOQQoI7ykOpZ+UH2EVuDbEDJ68qnGKFGVS8mwXBNRDShc6IzR9Xmhq5c7bgj6sr+Dl3Jk1jihtU5yjSiQtwCzzLUnkGEx2e6MerecP+1cW4yBPyD6Y2CF+cmx6dtGmWRP82SgecQ4GekWYF8IfZngvpUTwOXwpsuw+nX16io22/iBkBNbdPgep52YQbswY2iugYDhgmnMQVdO8UoWIT+oHH61+MYNmdep0bJD0Kkn0MSVy+S9 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2df2e322-10ef-4256-76e6-08d93f958643 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 09:16:08.6623 (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: s8GA5sGFnQE7vfl0wgiVf1oRdwxTkHX3iOaj/AcQZRPASDGGedlLTF5BP5ppQgNMvEi8TMpjAFbQhf5TFabS3q0X5Y+zRO/ftHKT/EvBvus= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4533 Received-SPF: pass client-ip=40.107.22.129; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-AM6-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The test checks different options. It of course fails if set IMGOPTS='compression_type=zstd'. 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/065 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/qemu-iotests/065 b/tests/qemu-iotests/065 index 3c2ca27627..22203ed480 100755 --- a/tests/qemu-iotests/065 +++ b/tests/qemu-iotests/065 @@ -96,17 +96,17 @@ class TestQCow2(TestQemuImgInfo): class TestQCow3NotLazy(TestQemuImgInfo): '''Testing a qcow2 version 3 image with lazy refcounts disabled''' - img_options = 'compat=1.1,lazy_refcounts=off' + img_options = 'compat=1.1,lazy_refcounts=off,compression_type=zstd' json_compare = { 'compat': '1.1', 'lazy-refcounts': False, 'refcount-bits': 16, 'corrupt': False, - 'compression-type': 'zlib', 'extended-l2': False } - human_compare = [ 'compat: 1.1', 'compression type: zlib', + 'compression-type': 'zstd', 'extended-l2': False } + human_compare = [ 'compat: 1.1', 'compression type: zstd', 'lazy refcounts: false', 'refcount bits: 16', 'corrupt: false', 'extended l2: false' ] class TestQCow3Lazy(TestQemuImgInfo): '''Testing a qcow2 version 3 image with lazy refcounts enabled''' - img_options = 'compat=1.1,lazy_refcounts=on' + img_options = 'compat=1.1,lazy_refcounts=on,compression_type=zlib' json_compare = { '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, opening with lazy refcounts enabled''' - img_options = 'compat=1.1,lazy_refcounts=off' + img_options = 'compat=1.1,lazy_refcounts=off,compression_type=zlib' qemu_options = 'lazy-refcounts=on' compare = { '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 = 'compat=1.1,lazy_refcounts=on' + img_options = 'compat=1.1,lazy_refcounts=on,compression_type=zstd' qemu_options = 'lazy-refcounts=off' compare = { 'compat': '1.1', 'lazy-refcounts': True, 'refcount-bits': 16, 'corrupt': False, - 'compression-type': 'zlib', 'extended-l2': False } + 'compression-type': 'zstd', 'extended-l2': False } TestImageInfoSpecific = None TestQemuImgInfo = None From patchwork Mon Jul 5 09:15:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12358599 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8CD8C07E98 for ; Mon, 5 Jul 2021 09:20:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3A53F61222 for ; Mon, 5 Jul 2021 09:20:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A53F61222 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0KmM-0002sV-F4 for qemu-devel@archiver.kernel.org; Mon, 05 Jul 2021 05:20:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0Ki9-0002CK-Ib; Mon, 05 Jul 2021 05:16:17 -0400 Received: from mail-am6eur05on2129.outbound.protection.outlook.com ([40.107.22.129]:48480 helo=EUR05-AM6-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 1m0Ki6-0007yh-EE; Mon, 05 Jul 2021 05:16:17 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JJ2SJ/PiC2QCBhAtFwNiLnOHAjsTxCbENc2+/MiRikQQGZnzltmDnfyIfAVimh9amb9UOGyVStLFX83QSmP81+cnTPIbmdR6ZFpTJBa3aSAfh6jI3pGPMP5xDf0uzuLU+DOu9xDu6GQRCh4ptrF+L85NwQBzxRNhYn+kv6zglcu79J3/ElY2P93JSYmLsHgxgLUJxbA6gkefQTO2UF8BNb3WfF5FIyI3TNhE7B77AGzdOWI2sJVgYGX6TtZCyvQdGSiitNQouLJXHdiIqxwVIbUbSqzYMhTTC0NbfWOVGiKYq+NvMV7MQpHKn5KlFvKKOv3F+1Sc50RpxWd9MiscqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FrqzPags1gflF5OmXymyVmkKu5DSmsxA+f6cGXcpqEI=; b=oAVWlPyAh/OqchzmMAw5oSSwXI2uAvMs321dcP9eq0pxx0rxXhtSA3D6+ugi1YksEutrJw9sYA9Kntx1dmQH3sxKTxSYn0/vqXQPzBLz8RdX+zu9G5OGF7GV7ucAeNWrHBoddOr5GjFwq3bm0OkDBhDC994+rhLWsAOqrtbMNHqiMVLd8zxmRaRFVEAWHNvFT3K3hoZ0g6B5MTNe5kve3jI+PszrB+ejmKnScuCUQML1h/R8KOTXp46UZpcM1pec6ScheobP+CW9jShajnECDtkYByAFfOAA2EFeUWx2sBJ8STcc7Fo2eDlkB451xnWhKdg+MTDmAWEofFHAK0GPVw== 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=FrqzPags1gflF5OmXymyVmkKu5DSmsxA+f6cGXcpqEI=; b=vuI0zp6LpZ5X6BdcNk82U8R0Dj1pOUbGM+80nO066qPx9XO1LxGmO6a3wajn7/VYatA/htl1iM+xl83xAnuBwlkbMEnaT2cEH8DE+hPJ4biGLyk3Kq81CALq/tj8Buq0UpO5XI6J/mYxKTV/9H+pqUlKJb151I4Exd3PZsLt3Ag= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4533.eurprd08.prod.outlook.com (2603:10a6:20b:b5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.26; Mon, 5 Jul 2021 09:16:09 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955%6]) with mapi id 15.20.4264.026; Mon, 5 Jul 2021 09:16:09 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, vsementsov@virtuozzo.com, den@openvz.org, jsnow@redhat.com Subject: [PATCH 05/14] iotests.py: filter compression type out Date: Mon, 5 Jul 2021 12:15:40 +0300 Message-Id: <20210705091549.178335-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210705091549.178335-1-vsementsov@virtuozzo.com> References: <20210705091549.178335-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Mon, 5 Jul 2021 09:16:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d7de04ef-927e-4e24-db40-08d93f9586ec X-MS-TrafficTypeDiagnostic: AM6PR08MB4533: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:826; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /tYlFSOwq0on7QLGjcfv+7n6AJIqnwPSK9wuxv63PNGD1MSPqsySQukfyv9qDfeD4HkZF4CbCaZjLOFxEKpbBPt9DsGjBhmkg6Isbh/w4AQ/zT6mNFeBPCdy/4P4n/GzBTLp1zBzzzwgm9y5Pt6qVrNw+qJ0tNhe3tOJn/xb9XFwBIfCDU2xrkwY4SpaENVY6XBBKPP6nnhudN4pryojwEDw44Xx2yLHWVDmK+d1JBmPVlU0TA7FcJL2zu6YPaWJ0GNZG9UFHT2Jrf557NZ7EGxY9D51uPe4qMnA6lOTWhIUHTN+/ZLjl+pronwRDm/3qFlZ+w0YJ9GC214t8jPL60oiltXSfcGYoBHRQCNaVkSmjGwULIwYOtn3TuhAnVWoshuZjHuP/XSDJu0xM5W1Q48mmofoVIBSyC+DzidzgOaT9jXBpG7nmXG+2kmv/I5jXnXA+cJGqmLERZEpaUe6tTYQGIDPnXJ9J1s2M2IRtfdKlVAvj5HXyIVF2ES2Vsd1HYrC5o/XU9xtCEXxTAcQiKAEhRKdxMgnZ9ARC44EmyvgG87sWyYgnEwL2ekR7aZZ/2XIWIuPpJ6lYZF9UGZRGqJHgIXEjgA8jLeae+udKolIhvCqc/nBPN3tvwWxe/rgMzJb+VuN3+jFodiYtRmtR4AxN+Elws5Imd3r7XAf0tRNjc2zDbv+pjpEqua3brWfnGO6m6uAmvQel9tfEdKHwJ39FFxWIB5bRlQHDptMNLTjp9xVJ0GM7RU5QaoqRYUx 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)(346002)(366004)(136003)(39830400003)(376002)(396003)(52116002)(6916009)(2616005)(5660300002)(66556008)(66476007)(83380400001)(316002)(86362001)(36756003)(956004)(30864003)(6486002)(478600001)(6506007)(2906002)(66946007)(1076003)(6666004)(8936002)(4326008)(186003)(38350700002)(38100700002)(16526019)(6512007)(26005)(8676002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: B47aZK7wPGBCVv24qGVQLKMDKMCTkaeRSQR6vB/hn1PXam0LgGQKs2PU9ikIMbgvJaAGg86YclbwpD4haLVXlt4yfdgvoRO8T+dqgLoE/uIk3/dWD+51DSxsEg3f4j0742D6G9C7CTUEiq8ljj1Bjfs5Pm9DJhPgYI96M6ygDgLTHTReHX0Np/5wilXyNwgc3T5RHFm3OUFMPFxXOffSsLeLskLqcIc1prtTgROHw9in+wEoa2+20UBHbJu9utiUcizOjDPnRiVwvwu7kFKQBtjJtBl1yrOwIsOpxopn0hds3dAXhgbX6U5lfVqw60JPpf/1m5dG0AXmGYyUXtwVBbDGtqtiqO+tkP/CgK7na1QIiAXGoEbCIBDS8TTtkvBUnWTAf7HP+FtSOwMZFX7wlKSRPUMdyRfrDL8VHp0nW3YZLDfAR0eXL7TDyjo48gvJzhcwAg6SfF1t6XDkGm/+us27L9U0hN+b8xyDHL+ijqIx+i7VojzY2Zy6DBVOS8F0290B7YSg2ulAy1o8NkhEBdaYmeQoSe4mei3g5Y2RRned+zvWIV7v0UuFSgaPIMAiIMoDtPJVP4Yojo45ode/2AymkZ1JHm0RSB3b6XN+CNJk1nW8RGuM6KDiTQ/sHhib65rXYhNsfT3qckWyKKk8kozakjLTzest1lslKKltb/JHWGhO83KDhhm3UnpVvgYJv6J5ozpH7lfZ7LV/jqliHrkzeXHTzAgLKlGMEpuVB+s2gmg6sAwjiz79/OTabWDtWfgJO+kjtykbv+Jk5vKSJ43OC547/qrxaPe9e7EUnLnYmrngw2i5Cc7yP10MhkJ3X186orzozbOmX0uSE+boj6DWRJ0ZRmukvxugiuI+QJ1orgh+evjPkDMTnfMG8pFxdowKXv2AhzW4apkUX+IGbygX+jo1h5nUZI8W9XZCn7G07JXmVG+oVjaY37UD3frAYsR/dz4uzDRbtVyL1XMg+wkXRqJ1QEg6lX0a6mhlzcEFPkSmbIyHDr0FWDusj6wC7Vh7j0FGeiJlCYxBaLUN/iSp6XAJg7dMz22U6YfJ3dvUcRIUcO7l52L3m304ZijclxGGRTvGtasfCNzIv4Jm1q6BGvrKf71nqxeF2xELXsbokDj+DiR4yufLtvovFPWuNT4IAryfr2wXgIFf80cQqxwHfVVlPA3y/82/CEBcTz4XPeqzU02NEHfnWB/YCH/dyMcvrP8Zlms+bU2vgwlGRXYQqbX600pKwR8zsd2I5ZsiitLyWdCNC7rjyAVE8zbEUdvYanAnDLjhtH1I+kTtu32+G1HW49wVf3kMb+VyTXBUH8u/gP+zLjLQuw8fTb7E X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7de04ef-927e-4e24-db40-08d93f9586ec X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 09:16:09.7943 (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: +0wNoikEfWeAINjSc+0fHOPLCVQ1am9y6CxMldMBesRAmpwdpSh3xllw6bQAIRFanY3MhK6oQdFPEDqXBP0VM0TAo82MJ/Xp8vsaQl40C1I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4533 Received-SPF: pass client-ip=40.107.22.129; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-AM6-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We want iotests pass with both the default zlib compression and with IMGOPTS='compression_type=zstd'. 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 --- tests/qemu-iotests/206.out | 10 +++--- tests/qemu-iotests/242.out | 10 +++--- tests/qemu-iotests/255.out | 8 ++--- tests/qemu-iotests/274.out | 68 +++++++++++++++++------------------ tests/qemu-iotests/280.out | 2 +- tests/qemu-iotests/iotests.py | 13 ++++++- 6 files changed, 61 insertions(+), 50 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 === Successful image creation (encrypted) === @@ -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/255.out b/tests/qemu-iotests/255.out index 33b7f22de3..bd3b13474e 100644 --- a/tests/qemu-iotests/255.out +++ b/tests/qemu-iotests/255.out @@ -3,9 +3,9 @@ Finishing a commit job with background reads === Create backing chain and start VM === -Formatting 'TEST_DIR/PID-t.qcow2.mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-t.qcow2.mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=134217728 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-t.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-t.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=134217728 lazy_refcounts=off refcount_bits=16 === Start background read requests === @@ -23,9 +23,9 @@ Closing the VM while a job is being cancelled === Create images and start VM === -Formatting 'TEST_DIR/PID-src.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-src.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=134217728 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-dst.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-dst.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=134217728 lazy_refcounts=off refcount_bits=16 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 cfe17a8659..eb23acd5ed 100644 --- a/tests/qemu-iotests/274.out +++ b/tests/qemu-iotests/274.out @@ -1,9 +1,9 @@ == Commit tests == -Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=2097152 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 wrote 2097152/2097152 bytes at offset 0 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -53,7 +53,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 @@ -66,11 +66,11 @@ read 1048576/1048576 bytes at offset 1048576 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) === Testing HMP commit (top -> mid) === -Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=2097152 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 wrote 2097152/2097152 bytes at offset 0 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -85,7 +85,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 @@ -98,11 +98,11 @@ read 1048576/1048576 bytes at offset 1048576 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) === Testing QMP active commit (top -> mid) === -Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=2097152 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 wrote 2097152/2097152 bytes at offset 0 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -123,7 +123,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 @@ -136,11 +136,11 @@ read 1048576/1048576 bytes at offset 1048576 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) === Testing qemu-img commit (top -> base) === -Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=2097152 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 wrote 2097152/2097152 bytes at offset 0 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -153,7 +153,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 @@ -166,11 +166,11 @@ read 1048576/1048576 bytes at offset 1048576 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) === Testing QMP active commit (top -> base) === -Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=2097152 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=1048576 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=2097152 backing_file=TEST_DIR/PID-mid backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 wrote 2097152/2097152 bytes at offset 0 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -191,7 +191,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 @@ -205,9 +205,9 @@ read 1048576/1048576 bytes at offset 1048576 == Resize tests == === preallocation=off === -Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=6442450944 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=6442450944 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=1073741824 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=1073741824 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 wrote 65536/65536 bytes at offset 5368709120 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -224,9 +224,9 @@ read 65536/65536 bytes at offset 5368709120 { "start": 1073741824, "length": 7516192768, "depth": 0, "zero": true, "data": false}] === preallocation=metadata === -Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=34359738368 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=34359738368 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=32212254720 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=32212254720 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 wrote 65536/65536 bytes at offset 33285996544 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -248,9 +248,9 @@ read 65536/65536 bytes at offset 33285996544 { "start": 34896609280, "length": 536870912, "depth": 0, "zero": true, "data": false, "offset": 2685075456}] === preallocation=falloc === -Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=10485760 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=10485760 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=5242880 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=5242880 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 wrote 65536/65536 bytes at offset 9437184 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -267,9 +267,9 @@ read 65536/65536 bytes at offset 9437184 { "start": 5242880, "length": 10485760, "depth": 0, "zero": false, "data": true, "offset": 327680}] === preallocation=full === -Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=16777216 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=16777216 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=8388608 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=8388608 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 wrote 65536/65536 bytes at offset 11534336 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -286,9 +286,9 @@ read 65536/65536 bytes at offset 11534336 { "start": 8388608, "length": 4194304, "depth": 0, "zero": false, "data": true, "offset": 327680}] === preallocation=off === -Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=393216 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=393216 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=259072 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=259072 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 wrote 65536/65536 bytes at offset 259072 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -306,9 +306,9 @@ read 65536/65536 bytes at offset 259072 { "start": 262144, "length": 262144, "depth": 0, "zero": true, "data": false}] === preallocation=off === -Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=409600 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=409600 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=262144 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=262144 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 wrote 65536/65536 bytes at offset 344064 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -325,9 +325,9 @@ read 65536/65536 bytes at offset 344064 { "start": 262144, "length": 262144, "depth": 0, "zero": true, "data": false}] === preallocation=off === -Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=524288 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=524288 lazy_refcounts=off refcount_bits=16 -Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=262144 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=262144 backing_file=TEST_DIR/PID-base backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16 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..a40682d902 100644 --- a/tests/qemu-iotests/280.out +++ b/tests/qemu-iotests/280.out @@ -1,4 +1,4 @@ -Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=67108864 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=COMPRESSION_TYPE size=67108864 lazy_refcounts=off refcount_bits=16 === Launch VM === Enabling migration QMP events on VM... diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 80f0cb4f42..6a8cc1bad7 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -224,9 +224,18 @@ def qemu_img_verbose(*args): % (-exitcode, ' '.join(qemu_img_args + list(args)))) return exitcode +def filter_img_create(text: str) -> str: + return re.sub('(compression_type=)(zlib|zstd)', r'\1COMPRESSION_TYPE', + text) + def qemu_img_pipe(*args: str) -> str: '''Run qemu-img and return its output''' - return qemu_img_pipe_and_status(*args)[0] + output = qemu_img_pipe_and_status(*args)[0] + + if args[0] == 'create': + return filter_img_create(output) + + return output def qemu_img_log(*args): result = qemu_img_pipe(*args) @@ -479,6 +488,8 @@ def filter_img_info(output, filename): 'uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', line) line = re.sub('cid: [0-9]+', 'cid: XXXXXXXXXX', line) + line = re.sub('(compression type: )(zlib|zstd)', r'\1COMPRESSION_TYPE', + line) lines.append(line) return '\n'.join(lines) From patchwork Mon Jul 5 09:15:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12358589 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D719C07E98 for ; Mon, 5 Jul 2021 09:17:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BEDCC61369 for ; Mon, 5 Jul 2021 09:17:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BEDCC61369 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0Kji-00052R-Oe for qemu-devel@archiver.kernel.org; Mon, 05 Jul 2021 05:17:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0Ki8-00029l-BZ; Mon, 05 Jul 2021 05:16:16 -0400 Received: from mail-db8eur05on2138.outbound.protection.outlook.com ([40.107.20.138]:40000 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 1m0Ki5-000816-P7; Mon, 05 Jul 2021 05:16:16 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a1cHVOZJMMnnm2d3uYqmnqSWaJQ8p8L3KUI6JhvvunbEUU6/TACCF/hCB4avVk8aZpfIUcFZM/+Wj/yHGmw/4pGT8rqchADuWx76lRiz5PFNdKkMulXFfwnt9gU+0Njjkj0neYfKuPxLAwwvtEjB2TklXe58mRzW7BoDfVjSE50zXfBFRveC+r12tSKyn/7VHTljHtzkCdoVJrG08+2gDOjzZGPxnE1v+0w0cqVJsxe+TS2Je43fN81uuRqlwNgkPqVFYqjZcXKyYYKzL0uJzyHE1qkTTsn0xNMTl830RQJ3cOWCcyjIHWwBneXkFGmN5QfVOMW2siY3d2vV68WIlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+1bJp1VbryRD3lAoFrjwUz+8MpJ6aYdOyYUt7Tj8b8A=; b=DCdTlYHcH/eLBd7NL5shXxrPK4F+unIQEvZoFU1Houwvh1oLZpFVKiiYnykgGJ6rAtBs5lW8PCWDBAJPaNzoeFP2oti3xczkYBr4cTSeVnoEHVgZCaHct5L7wDr9e6ZMnjHuVCPCL6AF5TnN4S6cehtwwC8xYqNcYXzlPqXJXl0mDfzHChDDbPUoGk9GE7KBQgznHNtDq5+AOmhAiXnVBSyNp99y/L0kiSugNA1WoM83e0sWTMex1EkGer9yIxWHqo9tm+hU4XdoBZIyGulCJPKQEnif/5A6oLoZYUAeSh7CmhaE198LhYuXtKTlHq71m1JMedEQP0/2edzXF0+2wQ== 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=+1bJp1VbryRD3lAoFrjwUz+8MpJ6aYdOyYUt7Tj8b8A=; b=b3/oRD5pBVyxnbzT4T4vUJ5TEqRbqxupWgtMjFOdqvf3gfB72d3Guh5YK5wy32VT2FrPuh7P8wfyepQ+boQ6plZB86nNVmOb908tNxE+shI225PyHU9JQXIdMKBvoz/JbVm7faEMxedHBkB6HWBCKVa+TOaYWetFrG0AAaNQUws= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4470.eurprd08.prod.outlook.com (2603:10a6:20b:b5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Mon, 5 Jul 2021 09:16:11 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955%6]) with mapi id 15.20.4264.026; Mon, 5 Jul 2021 09:16:10 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, vsementsov@virtuozzo.com, den@openvz.org, jsnow@redhat.com Subject: [PATCH 06/14] iotest 302: use img_info_log() helper Date: Mon, 5 Jul 2021 12:15:41 +0300 Message-Id: <20210705091549.178335-7-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210705091549.178335-1-vsementsov@virtuozzo.com> References: <20210705091549.178335-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Mon, 5 Jul 2021 09:16:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 931406d3-7e09-47de-0875-08d93f958795 X-MS-TrafficTypeDiagnostic: AM6PR08MB4470: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Xvv/TrkbrxSytgB34evcpgfYMLxKSAUI3bAzvHjKo/77K1Obw7E2xDLy1Od2yy/mOk31Ee84KVvHD4GxCPHYRUP9X7N2n+VH/thi9AiFZBLXPLP9VR6L6k9EKcTyf+UY4mJfJ+V7bqkpxUxFKBOWvN0uPlD5NcR8JVQs54OY+FRlkb6yfs1jbNXkQdGZyz5F+SMxCvL/fCiDoiY3SUqzOkGfBkG8Uv633JqC2ZPbIxGu0n9Bxw084EECI0NT0d47t00LQEQHZGcb7S+bt/CtEmBjvq0jcmBNtjEpsviUQVfY29Y3GtrBvKD0nuxp6L56hGQIqhbLBKqExwpKZ0Zkd9fo2tvWm8K/3VC1UNNvsl11BjriwSivwvoisQ56TdrpUJlh+BNs5aG3bHaVzpp29obwWCb24s3coNJ1pH053LJbjMlAq7+pKIyG0tZSQY/qSTDKxQZOBOUDU94CQdSYtKrwdjZ2Blnxuesu2aGjO9IBn9VU1jCA5GFdDxmAKXbQVRR2Fzjzcu0mAxW/G7m4UMHB9pAzVKRquWGSy7f0NSHg9nXgFUIo3NcbRl8D/7XB8YavvDpVTatiGnGLRhzfBlorWKSxSeyhUDmMD2a7pw1xyW8yTg7y3ZqaDMUxNU1C1rDrIfBpVQGUnW11ebdRYB4pCbUVrOZqVVholRedJlR4Y+rL6NTHqhKuNVSjqQUpbrbSd7Iyl8/2bdS+vhIYJAqILUXVwd4O0hC5mOnGVcDmvWspiamyNgWVa9uW/IMZ 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)(136003)(39840400004)(366004)(376002)(346002)(396003)(478600001)(66946007)(66476007)(66556008)(4326008)(956004)(2616005)(83380400001)(6512007)(2906002)(38350700002)(316002)(38100700002)(6916009)(6506007)(6486002)(1076003)(26005)(186003)(16526019)(5660300002)(36756003)(52116002)(8936002)(6666004)(86362001)(8676002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IB8EONy/wz1PZokq5KUDSvUHfcS+ye0jlHeLYSo0a528+ljU6afOGN9cNnhSJ8LxcVAPk2NacPcvPTO9ay/9ayCypwqpBsYZVOVlqezTXEwiyChnDe9ZCRJ/zEY9n5spK5pQK0COt9r9x4L6/WGOBK+cANbE32qcA+kNxL9u3shLgi7Vvq/AvMw+DPUC2W9vjmqMcRBtRdYygOxlovsx44zHMIju+LKqAPguta363P3zg50vIykraN5YJwKaf1jp14uxKW61qpZhferpf4ECGZ1KKYlt+zFyOd78ag1akJg/6PgY7kT9tnYXSg4LNEEp68HQzEeFSRj3TbEj7EhPiuLhZWKxguyTTAuXkgjm5YWEgZk9giIxBt52S5S5idbHurISfVigaGT+xH8cPngiPtMbt1sulcoQsojXbezrZldj4U827nNAT/uffeIC7iornDLTFfEyxZYT1c/3zkX/C1MjxrVO8obBu64u6849QcVNtITjJL9ZoKTNJrOqTI/+7B+Uetbl1rmbpFStwJoYfMIwcqP9APmCUW1zP86NJixpavQBIAZtFTY6+laLih4rypnMqw65PCZHYAYhi3u875yhWyVaBpwAu8WHRNZy1khpNQi+SiXaFXeZzSZRt3E9NMJ+uQHg3Q6ssuJcPj4XXX/MlufuY1xqTvkTr9W9I03/RjoIcwSBp07TWT39zQi3xcDpyVcnPn7Dsp22Q1MzYm/B5qA4f2UDP1909YK1vwrbsqy7N4yPIMBQtQ64BbB+iUUq1684zxZ/0ESjvSgdDHD0lhlANZ5Usufb+W5LEthb6t6fnFn5/sp2cO7pXHpPZjfi7QG7Mc/Zi57yJ3SAw1Vtn6wsDkjhXeakbjqEx+kUccz5CoVJnVomJHTnsv8KleODxbFFgwaHJKBVeYu+Szd/D7M057V6MYUCEGbFyMlkNAi+M45SVdOoYHejzumTP9m7pwseKPhTbbtjuyEqrrZ74T9IMEAV1Lx70/cDcBlGPo1HXELpInszh8nUHxNmYT8hNEzw4W1PWUf3/QyvV3OvQ6Fl+VEPEBvGI5916uBcMBWYyyHxtfrDqgJIu9v7dnoeAg/tMmhTUBHoHBZwE8aQ49fOSotE1kOlaFOv/nRpbm4C0jyFIEIJrW38hpljb0WnTgR13e/7f1Il3t15RvIFOLGnAnKQY87BfZI9lCqJ2rc3F+IsHDGOO7PcBuYNCfWYjegZPNWgMF7p5OV6HR1EoVdvhEvcCjUDSJDlCGlDqUX28BHqmtNOq9GKAtoQlNZ9+BmYfh4x5kjWy1GWOy3ABtTmc8iWKcTfLSRmfIV7WyQKWMHp//HEJR4A1Q3I X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 931406d3-7e09-47de-0875-08d93f958795 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 09:16:10.8606 (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: Cp7QydC3UeZ4c5GNVrJfgR0FekelW9uNL8IoTQq56BJPaDJq/19uvIkWVQArnJJH6DlCBGZlgmygSkV/a6oaA4uSLdvAD+qCq9U+HJ3pUuw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4470 Received-SPF: pass client-ip=40.107.20.138; 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 patch: --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3540,6 +3540,11 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp) } } + if (!qcow2_opts->has_compression_type && version >= 3) { + qcow2_opts->has_compression_type = true; + qcow2_opts->compression_type = QCOW2_COMPRESSION_TYPE_ZSTD; + } + if (qcow2_opts->has_compression_type && qcow2_opts->compression_type != QCOW2_COMPRESSION_TYPE_ZLIB) { Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/302 | 3 ++- tests/qemu-iotests/302.out | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/302 b/tests/qemu-iotests/302 index 5695af4914..2180dbc896 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, ) iotests.script_initialize(supported_fmts=["qcow2"]) @@ -99,7 +100,7 @@ with tarfile.open(tar_file, "w") as tar: nbd_uri) iotests.log("=== Converted image info ===") - qemu_img_log("info", nbd_uri) + img_info_log(nbd_uri) iotests.log("=== Converted image check ===") 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 === Converted image info === -image: nbd+unix:///exp?socket=SOCK_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 From patchwork Mon Jul 5 09:15:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12358605 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22810C07E9A for ; Mon, 5 Jul 2021 09:22:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B4E2E61369 for ; Mon, 5 Jul 2021 09:22:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B4E2E61369 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0Kob-0008F1-Qz for qemu-devel@archiver.kernel.org; Mon, 05 Jul 2021 05:22:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0KiB-0002GG-4G; Mon, 05 Jul 2021 05:16:19 -0400 Received: from mail-db8eur05on2138.outbound.protection.outlook.com ([40.107.20.138]:40000 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 1m0Ki9-000816-2y; Mon, 05 Jul 2021 05:16:18 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cvuoB5gtoKlhJqD+m8j8BRw7qIKHsK0wcduJl3yHYUyFextWrXapEYL38xJzOVDy8EURUC3Uii9EyK8APoy9gCg/yeZ7IAmxASfwzqVSy1EUgdn3AckFaZeBgdKv2Eoy1XJ45VIbFfbM1JX4hdydhOz2shFQDrt7c1hVRBIo9U81480W4Jxh0V6SlidLRACPIbahLSau0o6uN5nCx3Wn/zMrg98z6xg/3YoN88lhjdtsqnfQ9YZThTOBkocfUACOawbeU0EnzQXO8OeCSP4BiLTMUGdCpIBMuY6KUgqkwJAcLF9krb2pkP4rmDR8zWzuEmHjpbJe4r8im9JLExMn7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NH3bshTPyuYTxGnubDCiHXiX37McMNu8ImyQFiJbpVE=; b=Rl3ZPvdZC70scAvIbZFWVM0hivgZ4VJdZzcs+WBZLzj4BjjGy76/R7hQthJj0Ow35zwiDU4JfoBU0VdagFIAlbgqv/Pir0lJjVsBTaEIdYdFk+Hi8tvvhRgtBlS1FJfK7dg4gV5pxmzuCEGf9AYS9Jdr9gG5OJn04zP+TCg+aY220vDTeWXB2dCgj6Cfytg7WvM9wXPHPRBbgBm8j7oEL6KFrQWsJdnoSWWUqPhHvvMgChG83F+hjuoCHAH49alsS40r1V6K3P3Jbdg+QEq5fuu68RtGysTt6/jHVqBVw2/nrHASYk7aI7K37S9r4LVPwl88OvUke4693UVRWW4hjw== 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=NH3bshTPyuYTxGnubDCiHXiX37McMNu8ImyQFiJbpVE=; b=tw1mnsEuWLB1NeVaam6mnzjKaGOg6gJRgz6ZUT1JaXGAbc1pDUiWHENFfGR1um3JExtf/VtqOhEs9GcdlOp8pH0a3msazK0tFwk6pKvBa8iI3kuoq04j6iHZVXQ0ecLUJQn4vFxY0z7rHOWaMGrtd2Y2U4nZRTn+/EyFIy8IAgg= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4470.eurprd08.prod.outlook.com (2603:10a6:20b:b5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Mon, 5 Jul 2021 09:16:12 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955%6]) with mapi id 15.20.4264.026; Mon, 5 Jul 2021 09:16:12 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, vsementsov@virtuozzo.com, den@openvz.org, jsnow@redhat.com Subject: [PATCH 07/14] qcow2: simple case support for downgrading of qcow2 images with zstd Date: Mon, 5 Jul 2021 12:15:42 +0300 Message-Id: <20210705091549.178335-8-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210705091549.178335-1-vsementsov@virtuozzo.com> References: <20210705091549.178335-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Mon, 5 Jul 2021 09:16:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a5cd1816-656d-4f1a-65e3-08d93f958834 X-MS-TrafficTypeDiagnostic: AM6PR08MB4470: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1247; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KXt+GaC7+XE03+HM4ySinhuZyoAX8HsmV9YqxL11flDYRXj5AIbt1Fnhnff37Ui9G7en1BkkGC4/lZcp4Grr7lynZg/wJhMTJhmlHf/gZRq8/Kjt2jKS0eYNADkf6+4TJia40ihJPF4tEUZDtAbInlISLmSjksqcFs1ZoTH4/y3anLu7WBAS5sk8+W8KDNLmNAvKACRvlrotS0nXZeTg+aWy0ejA6qr5AQ7k/xrjOAZHb1P87l44qIlEOyfSNU7IczsspqPM3GRj90LN3U7/z3yAqosJthiENPq4Jr8l/Bge9T8B5xECyrLXo0H/wiFMF4DNRMPVHISmU+5PvC2s6isi49YtMB1fNkXlUQL7fXi1USIZgNnMjgpgiIkwn6cPvVHzE8rBpWLKQ8+WuJ3UPNWELuy365qctZbbXbG4EWQ89KSgvgIh0C6XF1Kjp2KZdYAxyG7DfYJBewG1xvCWfskF+KIit+d1U3b3wGlS7j6e71kEjMCT06r+Zaz3esR+G82ZIFwO+Hh2uURoMLrpj9AZ2Hc1VjsvnXomQPTvjUgiFnFx1pSHGBED1lBPkmZs/Rv7BZKpsSxFXrxHGV4OhA6zo/qu3mHlRVuDEKg20rXwRpw/OUbxCIpvH7EkaCb35+fHy+Fkf4olMXMqo9bSPsnB05LlRjpwCyTc8jzQRXX1Qosr4e1J8dnEHioFmY6TWdBiRj6/52IjcRZXBw4tKAaRWFNOr4WiBO14P2mYMx/Rjci3vz6qeaZrmYoAeGMd 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)(136003)(39840400004)(366004)(376002)(346002)(396003)(478600001)(66946007)(66476007)(66556008)(4326008)(956004)(2616005)(83380400001)(19627235002)(6512007)(2906002)(38350700002)(316002)(38100700002)(6916009)(6506007)(6486002)(1076003)(26005)(186003)(16526019)(5660300002)(36756003)(52116002)(8936002)(6666004)(86362001)(8676002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NLrPf8nB8fEn/7rafBmvU1ZtNyzoMV2Yd2y4pLCyunSKbVeotsx9O3kUtaHHPEyiJDtwWms46htrMU9BrBZzAXa3PR+kCO6W8epWni45NlOG+hBIpHZJCX7TqPoFuGIf65RmSL8qqPwHYYY6VODMnWnc4oJ7TgXEDeMMO0RiTT9GxzdLWnK1zW7HmhS2ZZalObPBkxFpXdx/hrQXXTSCXYq0nQ4U2PEouxe3E0DdRrTeyjQOGt0Ws0+7r+mu4+Vv+6sulzjKe1+xtmegyMb8ptUcxJ+8CW4NCL4fuCiSaWpzWFHWDV831U7Ah5CN9FPUJfgSHjVjozgOBDZYbfQxnNTytiODrSRcuuo6YyX5pe1XJuRz2SNMNUXsppOld+HQPtsoGiWpAIxaT0D5lPdeewBlJ8pfX46fXnJqfPAD4bMUyUAS56suud06pyQPlIxujdZDQj0TnEDC48QpiDa3La2mPVDM18kuL2JXehdi4PGOfcb0hbf12PQtse3JA7b75DXYKh5JLakYROBN41jeZ4+/75yboBjEgAkx7wljl87lmC0GxlFxeSh9QzGJKlp29MBq6qtutKYmybqgQnbVdmirMVQmjUT4ND4EpAgvYpp/X89keZcTllV8+XJfJ0fJb9nye3wAdvvXCBFxIuk42N4ccVCoNsRhBtd74jr3xCshxHv7gB3UvIEMJUpPjxKvvx9I6bYMSwQx3ZlRWuRjhOi0MsgBWcmDUQm1h6CUgkHPNjCaYrGO1XuBDcllpyIKRbaaDehhEXV1DEQ3mCwKCAig1uoAOtbWUWmiFVKEHmk4rHhpD2qikKWmlXcvJ9HxqjBt5U43Ax9UbQtqRg8WHDCoiJ3i7UxKokZT7JIi7kOWj6o+Jw1JZ6Nvbb88SNZSbEwPD2ATUkmwa3X6jk7psc+vobDddvMGQFeal3exctiBcmJGYQz73ktXHoIZUsSpuS/7Ov/O6gf/QJrODuRdbpg2RrJaoehMgW92VRzVMlG/Ep4U/UsJUsII9DD8FXr6MxTHwfxsXThAhjJB5SI7a1KzTbWkafjjvY5I6m7ZS9oalh7JCD8baYSAJqVvtxRYF/K8GgutqPivhJkn/lp51jznVHPRVwN3CKhBlKIHQ27g5g2KmE8NYR3q3UdQNl3StimAsBaMt2xC/YBVrreJRxW7gEVio8Fy6bsMAvW4pFZcEpO5PiyJCqDgQIyFxbkmDpvExx+bbDCxAea73aQ6T5KAGrMbe4qmmsxGYKynZITkjm9PbqaqnS/lmGoYBTYwhqUCxiC3vFOvrK9bt2ESHaT3zFOUSVklYxHoC4L8bEUzpRU24HmFbqiBVMaqUQQN X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5cd1816-656d-4f1a-65e3-08d93f958834 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 09:16:11.8931 (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: NHEkq8qPWcJulqmpK2x5dPcQSUJaV59rPmYFDuTemf5mZz857BjdjXK5QLiZLxERgH4zElP47r+85p6O7D+wDmPVfHN90OJDvSDPuHIU/W4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4470 Received-SPF: pass client-ip=40.107.20.138; 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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='compression_type=zstd' 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 ee4530cdbd..bed3354474 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -5221,6 +5221,38 @@ static int qcow2_load_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, qiov->size, qiov, 0, 0); } +static int qcow2_has_compressed_clusters(BlockDriverState *bs) +{ + int64_t offset = 0; + int64_t bytes = bdrv_getlength(bs); + + if (bytes < 0) { + return bytes; + } + + while (bytes != 0) { + int ret; + QCow2SubclusterType type; + unsigned int cur_bytes = MIN(INT_MAX, bytes); + uint64_t host_offset; + + ret = qcow2_get_host_offset(bs, offset, &cur_bytes, &host_offset, + &type); + if (ret < 0) { + return ret; + } + + if (type == QCOW2_SUBCLUSTER_COMPRESSED) { + return 1; + } + + offset += cur_bytes; + bytes -= cur_bytes; + } + + return 0; +} + /* * Downgrades an image's version. To achieve this, any incompatible features * have to be removed. @@ -5278,9 +5310,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 */ - if (s->incompatible_features) { + if (s->incompatible_features & ~QCOW2_INCOMPAT_COMPRESSION) { error_setg(errp, "Cannot downgrade an image with incompatible features " - "%#" PRIx64 " set", s->incompatible_features); + "0x%" PRIx64 " set", + s->incompatible_features & ~QCOW2_INCOMPAT_COMPRESSION); return -ENOTSUP; } @@ -5298,6 +5331,27 @@ static int qcow2_downgrade(BlockDriverState *bs, int target_version, return ret; } + if (s->incompatible_features & QCOW2_INCOMPAT_COMPRESSION) { + ret = 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 compression " + "type and existing compressed clusters"); + return -ENOTSUP; + } + /* + * No compressed clusters for now, so just chose default zlib + * compression. + */ + s->incompatible_features = 0; + s->compression_type = QCOW2_COMPRESSION_TYPE_ZLIB; + } + + assert(s->incompatible_features == 0); + s->qcow_version = target_version; ret = qcow2_update_header(bs); if (ret < 0) { From patchwork Mon Jul 5 09:15:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12358603 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB9D1C07E99 for ; Mon, 5 Jul 2021 09:21:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8791E61222 for ; Mon, 5 Jul 2021 09:21:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8791E61222 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0KnD-0004yK-L9 for qemu-devel@archiver.kernel.org; Mon, 05 Jul 2021 05:21:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0KiE-0002RD-BK; Mon, 05 Jul 2021 05:16:22 -0400 Received: from mail-db8eur05on2138.outbound.protection.outlook.com ([40.107.20.138]:40000 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 1m0KiB-000816-TN; Mon, 05 Jul 2021 05:16:22 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P+jn0dMLbdKzNI67Le2dOrE1WrXBgT9y3rikz3bKfqYHFeib8GmL/qXLyxze11Vm5gfQsDkJU+YlYpCICplrw/EnAyyDJGUb+1NliPkXVtS+B7B9vQDRnc3AGlw1G1G3eTvQJwvCvKWpPuUFM0pM2ACZScwluVY6W0DG+RieZUdsu/puAWe6MVXx4dWcrWETVV/pmXrZXiLIRmiCWGIS19MXHIVGdYmGgI+Aj3SanS/1+owGds7J5B0IV8NC769r+oT5lE8w/omhio+0XrmPqMvXWfqLLhI+zfjHBzFmyb+E2pZmqz52dwxgr0IXlDvnRKgISvXFhpq0VGKMcxSGPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1fP+7I89alnK5Kwx8oVYd6+FR22Ui4O7pKO03LH90wI=; b=STaG60YaDYkAkH8yE6fCfLILLeLYhv3DqlvedpGzSpAm/1evizyu/ebeBvfYyJllUDax0le6tKrZL1iNw962eQS7dj5XOlr8w87PitpaJRgodKth7I4cojWYaHpkMmec8LKE43E61rhdmItcQjvJ6tmkXdTkOOi7gbt813EXzRmdCI4QlyluIC4b75+dZmtGNzYqdqSWPBImj6vchylB34Q5QSbh28QsWAyp8k4/qCdHz4DLDxbFJ8FEEbU0vzpeEjHOOyyn3S2j1D9Grvx7W3YmlGJPvuhz3hAF/qOBN/woUEfn1iktJLG5F7yuNcEWQBFbwoFePuokbotXeFIuMQ== 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=1fP+7I89alnK5Kwx8oVYd6+FR22Ui4O7pKO03LH90wI=; b=HKZiemJOHZ9mQUWNINnK3QCXRaDFKrxqBhets+hwqHWIvgXuDL2xyZSC5e8hYBjgUKeRKdbf08ByM8H/2NXIIWqJr8hmjHkRGeGYlWFp0K3LfsH80Jwvf2m6d8zV6IJk3ucPnJLOgSlWdgj75+24YUb0NbJ9cqIG0d1wgpp8sF0= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4470.eurprd08.prod.outlook.com (2603:10a6:20b:b5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Mon, 5 Jul 2021 09:16:13 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955%6]) with mapi id 15.20.4264.026; Mon, 5 Jul 2021 09:16:13 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, vsementsov@virtuozzo.com, den@openvz.org, jsnow@redhat.com Subject: [PATCH 08/14] iotests/common.rc: _make_test_img(): smarter compressiont_type handling Date: Mon, 5 Jul 2021 12:15:43 +0300 Message-Id: <20210705091549.178335-9-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210705091549.178335-1-vsementsov@virtuozzo.com> References: <20210705091549.178335-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Mon, 5 Jul 2021 09:16:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0662909d-fbac-4fec-acc3-08d93f9588d4 X-MS-TrafficTypeDiagnostic: AM6PR08MB4470: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lwJjbwrK8L9agSR1N0kffX9D7qeRuHwFFgcyxiD2E+bmVsJ/OIU2HY/V6wH/WeIqQ1+mBTDrzbo0OjvuEMdDg4gQ/ZQO/on62WYd9gkuX/4PRPwqdy3NKUned2phPUs98Pl8VQaNVDsFQBfAwfgNL37UMao2glnvP1KpymXVxRsr0NgEkzY6BoHL+JLnp5RgsdBq/X/zGrNqlcSqDSQD17fgE4ECLLKvCjxDyGvfdIQo/4UE71EX2j3TpSHcNeRhXUFfC6shsQrQpexn9ZTwTZnOi6Vpq/hxv1kgdSEPCVRDkQ7hKEIc0ccwF8SJbwP2GP/iOt9igUqICZh07hLsETLCdcosSbsjVyPWPBQ1KXueubQVUJHcQlL5KvJI2LLbSls3s9rBNGrGDqJ/c8RoKo54iFRSr9zsBoPi7tP/tc2b8ftY3/W2tp7CJCf43yx7Hyd9jBp0L6FjPrN1Qr45mL0p0MU8aL+KbKO4xaIRGzQkyNO5rdRqTg+Y4iY6vel0Ovoz/ppTjGlOCg7hTTQlhVFiNVJQgTrCZlCdc2wd3f9Wc/BbPkJ0zfftLQQrmiAK5n2IYf4sRQnbcpBfMaFJFwBT9x+4v6OOZiPD5q1CrGmK3ImZGMR1NnJkQ4oDdWj97ZDs0Ap8MjeOdTvH51HC/qg7Vy655J2MlLlTNXfa/2mJgUxcX24ny3b8nM8IJCzzd1E6hyMliVrsfNjESDuCTKTT4EhOl1r9WLGNVni/GJc= 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)(136003)(39840400004)(366004)(376002)(346002)(396003)(478600001)(66946007)(66476007)(66556008)(4326008)(956004)(2616005)(6512007)(2906002)(38350700002)(316002)(38100700002)(6916009)(6506007)(6486002)(1076003)(26005)(186003)(16526019)(5660300002)(36756003)(52116002)(8936002)(6666004)(86362001)(8676002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wBL3rNs1765Rl+QxI36IO1Bzakjbo6cTdqtf42KDH6dfDAF0k9ZnfyLJIYhEsShSUQcd5QAVQ/tIWF1blzsrTBTMC3AIE5Rp/eSA+EGmAtXi3D991K1fRE6ChOfW/brpCaNS7bZAjb8ivptNce+lZUy5R3DBULSOMSdv23RT35BUR5REbqt/qxD996TWD6riT86ay6/IvmGRFIX0deelYhQq4H0WghVLVUb9YoVvYjnq0ATVjpkRDZZtCgpS3WJ51t97Qa05KXTDYC2BxteTNwPS8LwY3U71qcIjSxbNq0bEyHADh5lbodt8b9UxpvMfxqOP2MdUs3zqtx5YJjWnEghQNBwsQchPNzw7R8xN9GtsXw3FcdbThD5ggKQmcLRUplBDBcEjFm21qarqwwX8h3gH313paX4+9RohwK5RMHCc422emz48pZgl39dZeH7H0Kotpvy01ueM1ZErA3meIsMy0T+Wzu7gwwHXUg13jqN8tT7VgbHVJlIhj7sHoy36WPBn5Wt3iTsjgqqbWlfMahydre6W/wSEPmpDPhT5orTxgvHXINIrZU39bz7/GmXHSfKpAv9QCwN/UgQGSW/u6ngnlutb4WaRsAjgnDjgUKBm3Bz2z0Y4y4cTnDw2sWlSXLRBOnlbJKPznwFGkFBbkW2nJjpoHgjKSMV/YDTRciQ17Ewq8bIjQ9jH2BQ5tmYCyUQ93PuGkWuMmrRi3WG8HkusvgYiAV/39J0bfV2EcnPmAYu7wcwf0ReaimnRBqRs5FD8YTgCUDMPGY5GIth0OSJW2UxDp5A67ru52u66sDiE8Eke5Lc2qHY+OSmGw2E5A1pXPblN1CKCHNUjjL1JBZUcO++CLklds+TSz6goGuPzf6AyhAU+c4PGsvzZqr6vOF25iq8hpmfo/XNsytTghPr7PQCK962+iriIC2bA9u2L0jI4/eYKSPIWMZias2VzVo1xqfm5CkbtmKsS3JycuSbrly0n3BnFh2ByA3TJV88jjz0OW/DvSUdZgxV21QTIQqlKRrlSu8ZdC4F8W8Igr+hKMVH6Q2q1/267a3HI980hO9OMm/CoTTI9f3N2YjDHrSXuwUdClG3hPRs3CoSxGij6ynCQ4uki3mq1f70st0RnWHGNpMdt3puheZR3Sg65U5Ndadfs8nzCbnztGCXdYwvXk8j4e/BB3jnR+dXIaVtNoa20StuY2cfPyTqgjjbTQ36d8yrvS8w/gNP56AfG9ikExPZX4OYJByBBX65xPsuNjIB+Vweb1gYizM3Uof4YjTI8K3WC0w3Hii7eX+uLW57EMbW07owMs+1ETtj1/xjXhIYWe1uUyvyGKfzHzoS4 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0662909d-fbac-4fec-acc3-08d93f9588d4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 09:16:12.9505 (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: zQfINkH1W6sr3oxPEo1M+qE8g6daNqNnykEYL127xegAtHVXgtUeR6kSK/wZqcILnKiwJQV+JJw3f0ll7IMiFGxXpS+KgD2CYAozKAPIduc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4470 Received-SPF: pass client-ip=40.107.20.138; 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Like it is done in iotests.py in qemu_img_create_prepare_args(), let's not follow compression_type=zstd of IMGOPTS if test creates image in old format. Signed-off-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/common.rc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index cbbf6d7c7f..4cae5b2d70 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -438,6 +438,14 @@ _make_test_img() backing_file=$param continue elif $opts_param; then + if [[ "$param" == *"compat=0"* ]]; then + # If user specified zstd compression type in IMGOPTS, this will + # just not work. So, let's imply forcing zlib compression when + # test creates image in old version of the format. + # Similarly works qemu_img_create_prepare_args() in iotests.py + optstr=$(echo "$optstr" | $SED -e 's/compression_type=\w\+//') + optstr=$(_optstr_add "$optstr" "compression_type=zlib") + fi optstr=$(_optstr_add "$optstr" "$param") opts_param=false continue From patchwork Mon Jul 5 09:15:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12358617 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05D7CC07E98 for ; Mon, 5 Jul 2021 09:31:19 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5310F61248 for ; Mon, 5 Jul 2021 09:31:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5310F61248 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0Kwf-0001uA-Fr for qemu-devel@archiver.kernel.org; Mon, 05 Jul 2021 05:31:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0KiG-0002a9-PU; Mon, 05 Jul 2021 05:16:24 -0400 Received: from mail-db8eur05on2138.outbound.protection.outlook.com ([40.107.20.138]:40000 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 1m0KiF-000816-3w; Mon, 05 Jul 2021 05:16:24 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cFq4YZDsVRKTVTfAw/0VVD8NwD4E/OlzUBo4jMQPhAQmjcVgT1Te8UWyLcWqKP6QQSpmKnIB9ztW1wHj5p5RHsW9XqcZF/EGyoDu6VSFSKQ9zN2So3flhResLLVrRXavU8RtVsHzDtPZlpVS2/4TPW6mno8y1S2WhURSHkKZK7AzbTYWrrnebV7UrhOiIMCEOQY4sektygyT/MeNmJMcnQFQ4PfgD7rFXc76qiKerYo8CwwnizXiI4eV4X+JCYcQt22J9ZmWf5Bp+S6Q966goOL0svnMSbvohSBm33TwieHDOOWINaT6I/sAEMQkWmN3V/2umlksLB3zFMTHdhMi2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dIYqD3Xie1Q5yPkhlVdAH+j4XsXSYKjQOjn8kSLMHXA=; b=AJLQdEc8aZyp50Z+0GaoJvZpYyVvVRwTxYgpQWfcJZk0zQQ0Id5Lv/q7L40Uh1FE6gOS0YeiuvKburFSfXAuCEYnTuq9B/A4/Wswf1DLM7FFZfvakjHpYN1BB4rajWNpZktGBStAgAwa1B36ZKrBd9xiRxRW4zYR4ma4cevWxvDJPNqfssGhjVPXmxJQWzSVo+6XaBbeRLZi1KUFpxE0/O1IOaK7EJMoZ4q9/J3h2P6KRErMEvnQ0jCAQxh0hUJCYOvH+U7Tsm2clYFKCzOIyz/pP/fWpqj8aNu5wy5xR/oS8hPHh8cGJbxtztwwSI2DYiIAIlldS3Z43Y8VW/QOFg== 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=dIYqD3Xie1Q5yPkhlVdAH+j4XsXSYKjQOjn8kSLMHXA=; b=LwI9AUEpomb7RLjDuus/7XZEbfX5bRE44Xq4DYq/wKRuCM6IEcAkQka7TkO2oeW6XRMi/+THCNHBFKyMkABLmGhDg0PSa489ukMbpM27ZV1mzE0SzFFOiR/sE81PoVPDK+EHRjJSfMEwykDfByjHO56pU6ZalDLykEbkX0YRq0M= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4470.eurprd08.prod.outlook.com (2603:10a6:20b:b5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Mon, 5 Jul 2021 09:16:14 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955%6]) with mapi id 15.20.4264.026; Mon, 5 Jul 2021 09:16:14 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, vsementsov@virtuozzo.com, den@openvz.org, jsnow@redhat.com Subject: [PATCH 09/14] iotests/common.rc: introduce _qcow2_dump_header helper Date: Mon, 5 Jul 2021 12:15:44 +0300 Message-Id: <20210705091549.178335-10-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210705091549.178335-1-vsementsov@virtuozzo.com> References: <20210705091549.178335-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Mon, 5 Jul 2021 09:16:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2014934c-15ee-42ba-b602-08d93f958975 X-MS-TrafficTypeDiagnostic: AM6PR08MB4470: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3513; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jxtotNWIspEJ6oy3gW3dJo9Q/qIeQo3AnAgauR1XEt+Q3MywCUOnzvEQm8j+wKLD1cUiPdzYzNQEvFDzhkylaZrtV/EGniZZt2yT3JM282HQ77xWvtziCG4cvRKInOftt37TpQfcnQQLcr9xla0Nmyq8IWtzkoZEKKd4dpy/XZQqnB/nrU8zb+KemVaXq3+bCopLchV3Sro4/ACGCj+EmgRSaDITN5HsrvS5UTebRySeDMQUwsixbJ7zlvYUtzYOlE6SIDNO3t4gPY0y0aj8LJAbmyKq5rX+jFvN5vcA1XFa/Po/FjqGYuNIxLWOMl4dt5KYqwdFXMvP9wFgVmVCPHBbk0wxEKQ4I6i4KTBBRLIoznzIcvDUcozZVt+vIz0P52KMY4ryO6nEC2W5hXv7PRsnJ7Z47g4T0Tv+8qdWSBNtzhbfyhkkAqvvsP9lBH1dyE2rYr2ktdZS5l5aTPZTXJNn7OXHQnTGx7GYaA3dX4GylRqw0QvoIpivovURaDqSMditkhirf5yP6T7G3mskonF+dQmYa9ShGk72wa04413OBRriWrLelf0CUh0jMf0ymtECasJrREHpMfOzOf0J+3VaSpfVTx6mynYQfRXJ118paTir4+SNI2SHwjhg2fa4ylP4gGLKzgR/S5tNKKRkdxN/1xqERNMV9GmsOxHoW3xc9IdMbJdxvtr5yZmqf6KS0thvLY2y9Z/T5Cnrzh5rG6IdXYCfsYsPazSZ3NS+s5M= 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)(136003)(39840400004)(366004)(376002)(346002)(396003)(478600001)(66946007)(66476007)(66556008)(4326008)(956004)(2616005)(6512007)(2906002)(38350700002)(316002)(38100700002)(6916009)(6506007)(4744005)(6486002)(1076003)(26005)(186003)(16526019)(5660300002)(36756003)(52116002)(8936002)(6666004)(86362001)(8676002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2AbxwYig2mqs1GmxGDWD3AtmvLElDeEvH/dw89Tp2qK5NGmNzFWawBU54lSDjHv9k6Np6sVGkBl0rD+OJrie8nWW9uVsccA4HV9sz4bj7TL/scsHfQVM8SsdxlyGuNhcZisFEyrLoumh/R2MTlLgycnl4unaGuaacnI2p98rnbzNIRhWkgXmbRXfaJATcUVWfceazvwMGMXbiefoFiKln5YHb15/ZcBgj4QMbO/uI+y9bFEYRD/LZP4nYWQcvnxO2hb57VWLQLwNMc0V8HqJ/NYvV7z/afY/ei8glPy2QyhrElh//M5hilOphMl/GMdZXnDHWXnHIa9juInkGTAwXIapfqy9Bd77D6YaLJkUnk2yBE5MkK2EDlBTqcIeNyFn61IxvCHbaNOSY5khMjwqKqyKKmw6WfN+azxfFRLuDQ2zCkDiG6wSk7msyubftXNG/DiIn9AEY9IGLNUZvxsc2cGja7Wd8giab8DDdcmz39eHaA4hLoEv8WFU+A3iKr4wBxlObxjGPoyi+6g9DDjHq8T4wKnK1EchoWZC0cCNdpUshfjL2M3Mbf2MVNY0KaIwKdmJy3lo5X34Vsl3GufBOLgGoirlPesiIXyzK0g5KH3GieAfrF2pw/W2cXRpWySBMCe3XZtlQCAWVOGMRb7CA+3P7pXJmdCT5ufXW3adEjAxxvzZmIC5PQh1mgXACOMfrxgJEQCHbLyCdXBn1Wa+lYExvR/SencoJw8vOxrovsfhS4qhDvrBEgGkVpJqNTPrJHvYAnumisu4DaGpLKZotkCdL6jxvd7ug/BP2YVjoiwXqGvgZni2D74dQzLv/BofsFZlHgv5QXm3njC5DFTym1GfWOMcbuei7y3jSHo3lL1oQd9c+0qpGJBQCZbmDKEAYXLut0d3xajmmelA3IujfIQLzGGBaQ0xC145HNf31fRXe6ffKG6eol0Mlv9fqbDdNKK18r4g47s+RQNWdM7kCMiGLy0dRvHt9aUKNrRJg29hX2YjP9ykjJTduxJqRds26Hc67qF3YQEJwxcf2/cxWsmHpt6n9xB+m9R91Bxl3k8L94k6LcbnH59BFTg9oc6HBLdDYUA8UcDQbhkk17uIUcb7Nz5LJDQ0F0dnCtr37HUuFmzf8poDg9tsqn3ejDNAKngVzPQGlrzwfqzAAE3b595nqAXF1pvgWBgGKQByYIJ1Lo6V1N3SIzky4VnTMHa99rPZezH9o0xM6IxoeGznreGtSWpWAd7tJQGNH/l+5FG6ZI/Zy6OOwwC49BbGJ+z6IGfc8FKdkKE/6VQWbM2BXImalYLHVjsyKPTrn2olKPZVXHuT34nn3MV5v3mB9NsS X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2014934c-15ee-42ba-b602-08d93f958975 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 09:16:13.9810 (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: 4CA1J1L+ANp5gYklOFrESbwyb9kfIuo0iApVM7cm60rJ5BrqTDE4GLd2H3xIj2GFbGH2Fo6FkcR81K8C7a8UKNkypYhCBZxMFXgkVzXuHoY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4470 Received-SPF: pass client-ip=40.107.20.138; 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 4cae5b2d70..ee4b9d795e 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -994,5 +994,15 @@ _require_one_device_of() _notrun "$* not available" } +_qcow2_dump_header() +{ + img="$1" + if [ -z "$img" ]; then + img="$TEST_IMG" + fi + + $PYTHON qcow2.py "$img" dump-header +} + # make sure this script returns success true From patchwork Mon Jul 5 09:15:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12358601 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABFE8C07E98 for ; Mon, 5 Jul 2021 09:21:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 47C7161222 for ; Mon, 5 Jul 2021 09:21:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 47C7161222 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0Kmh-0003n2-7w for qemu-devel@archiver.kernel.org; Mon, 05 Jul 2021 05:20:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0KiK-0002nu-LH; Mon, 05 Jul 2021 05:16:28 -0400 Received: from mail-db8eur05on2138.outbound.protection.outlook.com ([40.107.20.138]:40000 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 1m0KiH-000816-G6; Mon, 05 Jul 2021 05:16:28 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mY69rnkLZRgTMcbmZcwihquXaL+QgHB9sd8rYiI+IlKCVHBKeJJoflCZzamdmYLcSaCJ6dhVUq/UhzWZz/If/B+rk499ri2Cp7unZnHd50R985PUeNZd4q5JXiAomYCiMwYQTqIiTwACh7E/lQ/+AvKNrYnQdMqn52mayE39QLGvKtuosraWkpo7hIWNctyC9mZTYAfuq95QnKPT6AcDjCYSVdS7fDyxyRmD6NPJ/ewz4wao98m9rwVN5PvmHL5NwDv5KHG9Bzkrefy7E/NoS1FQVlgorp5m83yJCmSHZTsKFKlhmaZg0BFjdP5O23CLxwdptSv3j+5U7lMBZIIv1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NEViaYXwoYVjyIxREYsut4N7XUTEfvMMS5oO0h4ET50=; b=i4MdICH7fjvzhaLQTK1+VlWYACyighfVJn608LUXHWdxwZZEdkkxKPP2tMJlRLZc8cnTnqL+gvigi974DFwaOrwgHssRz4X8+p7/sSnDbvPxCKxmQWP/JnpZBNK9uhkYUmAjZ0A57M3oj4eMEYzb4PlIHw8eHbDAGXuj4GK5xkgWeS9UG/CaKdXnqJ7dM089TkdgEWKngMXrWQRKF9Q7rW/2+srZll823IFsEE9PPMqe8qjuxPyglNtTxDRW7t6LOgs9A+pRFPxiR9HB0E/ikEuOrg3wJqn/MqzP+kvigX4eOFQJH/1gq1BbQiUrNSPhrvBC+8bR/eKuzsICW4D6Qg== 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=NEViaYXwoYVjyIxREYsut4N7XUTEfvMMS5oO0h4ET50=; b=bvk9RolOJWn34xbzrXPSWtS/XyIt5K7tKugokwdSChYcjF3VnkvRoFyTzDLKC0CvFjFlaghTEdwtukBl8s6O9rrImQIXjiK3gbUAIJGJqRIAXkC/FjKu5VRn04rXUTwJsBQq9tr+3dcSSr+Ih1QypJlhNeiU3p8OT2ZszKaZJaI= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4470.eurprd08.prod.outlook.com (2603:10a6:20b:b5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Mon, 5 Jul 2021 09:16:15 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955%6]) with mapi id 15.20.4264.026; Mon, 5 Jul 2021 09:16:15 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, vsementsov@virtuozzo.com, den@openvz.org, jsnow@redhat.com Subject: [PATCH 10/14] iotests: massive use _qcow2_dump_header Date: Mon, 5 Jul 2021 12:15:45 +0300 Message-Id: <20210705091549.178335-11-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210705091549.178335-1-vsementsov@virtuozzo.com> References: <20210705091549.178335-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Mon, 5 Jul 2021 09:16:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ca4369bd-dcde-4ce9-84be-08d93f958a10 X-MS-TrafficTypeDiagnostic: AM6PR08MB4470: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:55; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ft/wPjh7T13pQ60CvJGjRXtkSOh9YTqhqtRx2SyArqvvRa2O7IApIdCeWVN0yMd42+lqQmkXF51GDmrpWS4HSB4rBeqc3PDnAJsxP0rqFZn0a6D74FWewlhDKeEXUEjl0yVnlZGYTnl7az4zuU1XD/QUj1pCIcO0Q2mM01JgPOsyOpwBsUXlpWBLv6ec/uv7Jxp4C2IHqumiZPAUb+IIWz6O50DvLQmvemZw4/D/2sJm99f+bkIT+EcE9qucjcKuHKwSXfzVaFIi7mz7xHgBzfFfvve+v6REusLq/3CkeiYUJAmB/Vyr3DXBWLGiBOyiQOogUD7Cig1M1et3/2cfof3o2MHT4KXrClacffIVcEeeLYtweXNb47mTHPMazgx5obEtCAKZByJ0VB7cBVkeIUzy9aIrClkcOVSJ+jLt/253ZL/yYQlwc+Ap0jnKcjRThGWT2ieLj3ru2QHN98TKL7UyvZ/HbeTabM5+ij4aBier3f60LpJG1201sGgaeXbBvhqZLoYmrXIhwM1nx7YAObYHyWUCYxdTakYjxdn0ttklSPvXUqRI6El7DCoYtLX4T2n5Y6fCRDVQ3oOQbzXThI8pTSYN1y3EWdQBxbHEkr74HY4Sua4Q+WCCwoU2U5wgVZBQb5GkEG1zOdHC+HvEUJ8FNMnGwGBkbzoi4Ds+06NGVT18qs1ZiqMY27+QmFseDhoFt/Q0OcN3N5Fx3yus7Cn+dJQzHBcEBbcDLjXd0Impj5RfvexARdgGoVgwYoQE 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)(136003)(39840400004)(366004)(376002)(346002)(396003)(478600001)(66946007)(66476007)(66556008)(4326008)(956004)(2616005)(83380400001)(6512007)(2906002)(38350700002)(316002)(38100700002)(30864003)(6916009)(6506007)(6486002)(1076003)(26005)(186003)(16526019)(5660300002)(36756003)(52116002)(8936002)(6666004)(86362001)(8676002)(69590400013)(14583001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VMhZ2P0/+FuhjUet9CXzOwy5QaN9OQltDk9Avt1/4J3opPyE028NX1bYEhvdeVd/O224bKeIR7bB7liZ/zBiW1IqoJ41TNaPHRyIfKStDQ3Fg/nLiTT/SiBoaMKo4CEyJXVu/Uo6BWOC4J8fas5z28HfR6Narr2Wo8ohAJ6ps1yI6rDwi1igRaRwIPLWWR/3zM6ww3RKUz+euXVa6bV3FSCLItQbW82+jOFi2Ik7dPWWmIGc1eYTXDxAmD1/1drEBs71b8eNW18Ubi80vqCXjUTU9luF3kuaBJeX3IKvk8eWWsQtfDUWAObo6mIRqM/2r6mb4Y7M6ffq8kbvVg2LWW6xsw9R5KITfCQnQ6l6AenQMA75/QBCYDTDBcubhSYddVb7JS+taSS+BBxyghSb3BMZWBQTiXdxGIM922QqZZr9k/BVhEvk8zQTMUGHSr2n0hiQFdZRITXMt3VwHIWOwVyKWj0VWfu/iYX/v+xlto6QyFWa+EO5Q+eNMyR/HdBrIGBOe58sRcTJiZtt5ZbrkJxuSZvqYbwEWrYhhvinMV1ePEoLV2HZxelNxiTzP8VDRVJe8ptDe9t9q9C8YeYh8ZvokRd8GWhPuT+kZKjxxT29oTicLZ7t0Rtk6qU/juXeRue4NZsch/TjdnaYWCoiNpHQxNcYkncZfSMP856L5I04fqWCr/d1QiFyEdUp4IjcJND7CxXDZUgtvgD7GVeuFJLVsuLbkPnkoIojH9TriqJFMdPWr6evWwA7h8LPeOW1imZ2TIOWDa9Djm3lmeQ6h0BYg3tMgGqyX0CPoiBkL7eUTH2u+hqRlZmwbKCJb+IF3axoxNRtGfw3JDV9eT3sSu8smcJzAguw5rWwgeSGUVgGIS/5+UMx+T8wH+o4OtMABIajRDqzhWwb6hmr60ov5sMjvycYemA6QoGn9d/hHndhVKSphxwikZKfmiPNWhGsmoFIXkOkk3QHxRSvWw5j+HaG+jBt35BdW2mL0BTo2YBf3IbsZZv/TDu+M6MMTv+frx55VKU0WYP6byD64x51e72HUsO+rKa0f4nzRD776w7UlLoKIZqbm0dikfyTXPFARPDt9LLQj52esSGAfTZQFk0VLHWTOjFHTbOYXuq63guBpTJgj4msU/SU7c9husVjNxNrnkhIaFQhP9DdwPj18LIg/VshS8dHqrOhF7/DvbLcT64n3Bwc1JkeeHSVe0tUuOQr2f55XS4OEDkdsAYqQcyte8P8A1XJ4w1dJjiW0+PT1V0RXYXPl+RMRyxSTYabnWg4vBE7ArIg37uJ68/uIADnJydayZCE7dv6cka5cUOdf5gUssjqtBdlx86nVOyW X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca4369bd-dcde-4ce9-84be-08d93f958a10 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 09:16:15.0751 (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: qUW+54evV/F49BVl3BT6gBkev4LdlKdKXxYlF2qFhjGo6o4c/ib5txS0Q3/mo+d8LyuSliig+PjVH0PmivDXpbpPSvhMJP9g8+Nat8+wqLs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4470 Received-SPF: pass client-ip=40.107.20.138; 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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_header\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=0.10" "compat=1.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 echo echo === Rewrite header with no backing file === echo $QEMU_IMG rebase -u -b "" "$TEST_IMG" - $PYTHON qcow2.py "$TEST_IMG" dump-header + _qcow2_dump_header _check_test_img echo echo === Add a backing file and format === 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 # 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 # 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 @@ -107,7 +107,7 @@ echo === Create image with unknown autoclear feature bit === 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 echo @@ -115,7 +115,7 @@ echo === Repair image === echo _check_test_img -r all -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features +_qcow2_dump_header | grep features $PYTHON qcow2.py "$TEST_IMG" dump-header-exts # 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=1.1,lazy_refcounts=on" $size $QEMU_IO -c "write -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io # 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 echo @@ -73,7 +73,7 @@ $QEMU_IO -c "write -P 0x5a 0 512" \ | _filter_qemu_io # 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 echo @@ -82,7 +82,7 @@ echo "== Read-only access must still work ==" $QEMU_IO -r -c "read -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io # The dirty bit must be set -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features echo echo "== Repairing the image file must succeed ==" @@ -90,7 +90,7 @@ echo "== Repairing the image file must succeed ==" _check_test_img -r all # The dirty bit must not be set -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features echo echo "== Data should still be accessible after repair ==" @@ -108,12 +108,12 @@ $QEMU_IO -c "write -P 0x5a 0 512" \ | _filter_qemu_io # The dirty bit must be set -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features $QEMU_IO -c "write 0 512" "$TEST_IMG" | _filter_qemu_io # The dirty bit must not be set -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features echo echo "== Creating an image file with lazy_refcounts=off ==" @@ -126,7 +126,7 @@ $QEMU_IO -c "write -P 0x5a 0 512" \ | _filter_qemu_io # The dirty bit must not be set since lazy_refcounts=off -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features _check_test_img echo @@ -141,7 +141,7 @@ $QEMU_IO -c "write 0 512" "$TEST_IMG" | _filter_qemu_io $QEMU_IMG commit "$TEST_IMG" # 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 _check_test_img @@ -159,7 +159,7 @@ $QEMU_IO -c "reopen -o lazy-refcounts=on" \ | _filter_qemu_io # 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 _make_test_img -o "compat=1.1,lazy_refcounts=on" $size @@ -171,7 +171,7 @@ $QEMU_IO -c "reopen -o lazy-refcounts=off" \ | _filter_qemu_io # 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 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\x00\x03\x00\x00" _check_test_img # The corrupt bit should not be set anyway -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features # 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 # The corrupt bit must now be set -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features # 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 # Try to fix it _check_test_img -r all # The corrupt bit should be cleared -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features # 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 echo echo "=== Testing cluster data reference into inactive L2 table ===" @@ -139,13 +139,13 @@ $QEMU_IO -c "$OPEN_RW" -c "write -P 2 0 512" | _filter_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 # 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 e26d94a0df..a9bfd8dc0b 100755 --- a/tests/qemu-iotests/061 +++ b/tests/qemu-iotests/061 @@ -55,9 +55,9 @@ echo "=== Testing version downgrade with zero expansion ===" echo _make_test_img -o "compat=1.1,lazy_refcounts=on" 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=0.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 @@ -68,10 +68,10 @@ _make_test_img -o "compat=1.1,lazy_refcounts=on" 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=0.10" --image-opts \ driver=qcow2,file.filename=$TEST_IMG,l2-cache-entry-size=4096 -$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=1.1,lazy_refcounts=on" 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=0.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 @@ -96,9 +96,9 @@ echo _make_test_img -o "compat=1.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=0.10" "$TEST_IMG" -$PYTHON qcow2.py "$TEST_IMG" dump-header +_qcow2_dump_header _check_test_img echo @@ -106,9 +106,9 @@ echo "=== Testing version upgrade and resize ===" echo _make_test_img -o "compat=0.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=1.1,lazy_refcounts=on,size=128M" "$TEST_IMG" -$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 @@ -120,29 +120,29 @@ $QEMU_IO -c "write -P 0x2a 24M 64k" "$TEST_IMG" | _filter_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\)' $QEMU_IMG amend -o "compat=1.1,size=128M" "$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\)' $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\)' $QEMU_IMG amend -o "compat=0.10,size=32M" "$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\)' $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\)' $QEMU_IMG snapshot -d bar "$TEST_IMG" $QEMU_IMG amend -o "compat=0.10,size=32M" "$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\)' _check_test_img @@ -154,9 +154,9 @@ _make_test_img -o "compat=1.1,lazy_refcounts=on" 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=off" "$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 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 \ # 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 "=== Testing compression type incompatible bit setting for zlib ===" echo _make_test_img -o compression_type=zlib 64M -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features echo echo "=== Testing compression type incompatible bit setting for zstd ===" echo _make_test_img -o compression_type=zstd 64M -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features +_qcow2_dump_header | grep incompatible_features echo echo "=== Testing zlib with incompatible bit set ===" @@ -75,7 +75,7 @@ echo _make_test_img -o compression_type=zlib 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 if $QEMU_IMG info "$TEST_IMG" >/dev/null 2>&1 ; then echo "Error: The image opened successfully. The image must not be opened." @@ -87,7 +87,7 @@ echo _make_test_img -o compression_type=zstd 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 if $QEMU_IMG info "$TEST_IMG" >/dev/null 2>&1 ; then echo "Error: The image opened successfully. The image must not be opened." From patchwork Mon Jul 5 09:15:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12358609 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9603C07E98 for ; Mon, 5 Jul 2021 09:23:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 493D161222 for ; Mon, 5 Jul 2021 09:23:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 493D161222 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0KpO-0001gZ-GU for qemu-devel@archiver.kernel.org; Mon, 05 Jul 2021 05:23:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0KiO-0002zE-4F; Mon, 05 Jul 2021 05:16:32 -0400 Received: from mail-db8eur05on2138.outbound.protection.outlook.com ([40.107.20.138]:40000 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 1m0KiL-000816-EV; Mon, 05 Jul 2021 05:16:31 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=btlLezHBUuzbbBk/SK1m/7VHQFoPQHjslceCynSZA90N4O7xyF9KYrjHNDmVLHBwaK3o+0pEtf6yha9QzYoWUwSR2bU/q60nLyt+C8x9fGflS2a7PhLZgLFWxFo5UUoD7wR15Tlx0wh+l4qrxcfd66MMaZ5ecSLCfpkBo7JKla8DjV5/kCQRVwkR6+kpLucSS4HfNPuTs0WRhvD7oowF83ueWcwDxOUGIzQ7UzaILRdCqKzfZffI/KTsONorxkPOMV4JG9QVkm2W1pXpN5YuGecWnZnrlNeQ596HDi+Nm52ub9xjAusHUvzF0k4aDgkRbDIfeJT7qO7fY4cTZaRUoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iw7oqltgwahQORdX4pKkqcEE7IJVUWBLjX1XvR+Ug0E=; b=KT9NsgjHw4bBLbFTJb85IK0LUmszZR0eGsqII6+bKsKahM8vdLLh5kogmqBVXFb7EU7qLqDfLHXxdKj3wvR1O3fkqQEUwP75uA3mMJ3cUP9gi74y8sEpz3JWAf9zAslHrz2yrPpCGtKsvL6udWG+lQNbGdcJrsCBJ6xsL9byXYQV7rRqWwGjsyYcAyvNw29TlwTpBbqtLfwSzC62dO7EIbcKsfYxPp/6l0OYN9R1nCJAHwMKyI6fmCxvWAQPKmwc2/pqxy4hZlJfSUNd+jOxPZm1FGIJUc8xZKMTRVtu3HI7j6FvBoFr044FLeXQpjNw4TaV//urEtYKeBmRW3FTrw== 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=iw7oqltgwahQORdX4pKkqcEE7IJVUWBLjX1XvR+Ug0E=; b=jYmiFD+huNrVLBevVx5D8E2WOOZKgv/3Ieyv4jvHOKKBdsrzcMe/3OWWQtXhHPyCgE6RtKeyvl3j0WfDG2qsr1fjhyrRuvrkRbVj38p8rwZ3qQxcnfyIlPLButIbdxqjD9JVbV0wF9LeSDLf0lsiXbESqEHTkg5qndhUK6zFY4c= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4470.eurprd08.prod.outlook.com (2603:10a6:20b:b5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Mon, 5 Jul 2021 09:16:16 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955%6]) with mapi id 15.20.4264.026; Mon, 5 Jul 2021 09:16:16 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, vsementsov@virtuozzo.com, den@openvz.org, jsnow@redhat.com Subject: [PATCH 11/14] iotests: bash tests: filter compression type Date: Mon, 5 Jul 2021 12:15:46 +0300 Message-Id: <20210705091549.178335-12-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210705091549.178335-1-vsementsov@virtuozzo.com> References: <20210705091549.178335-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Mon, 5 Jul 2021 09:16:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5515c7ed-743c-45ec-679a-08d93f958abd X-MS-TrafficTypeDiagnostic: AM6PR08MB4470: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2201; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6be5AhbSgr9ynPY7xj1LJYpUqhzufn641HKVcrcxcItVIBlJ2h/wiecPx5XS/pcPHaiq8aGez7kR+wjfw1z8IUt3Kp4zb8YfZ3UsNt9dBuPCsIddCPYddxAPM2LzI/2t4zOK7KW49HvAgJ2InbkRHHBBrVcm+2OfZpUiezRayx3XTT7A3LumRV92DkE+8VjUVT8uzniZjFoPHg7ItQR6G5U5OF1ZCoqyGGLpb6VJOTCSt8dy5WnAUNIOVD0pL+OTK15d9MkJ7bxZgsdHWUJ3KWgogMtHLuyzvf/3Z7KHhT2tvz1ioChndpdtdXEPQ9GE9glcx3dGSsgWyYLpnz2WpUJgwSMT15hqfK6+IIV4X2uuqir8bsuvf/Im6d8EQIh6IFyfTfCfiSgXo5E0cHGzN/Ej/2Y3Pbo0OQVsGtR1bw01fPknBi9u1ScTYUnNRW5oXiesa/UxdhaDQAv7g6E9ilvZal0DsmamI5ylPrNXIVI6XC7NyzMf/XZJgnfU+RaBGTU3H5fquMOeHWGgq/NJk/TYZ4EBxwcw/d/Ks0Ssmfy6ukLfRq/fqVduufa/rt8/J9N55d8xjmIgPSommbzxMzgX/mI0DFvjPyyOir2kZZZ+DGdB/69SOuBGBxQd57KSe5n5eNgq+i3SNUG/lbD2mQSm4PXGezyLvKMczfsxNQt3wPWLhYtw5s9oPgFG7ftI746P4Z6X06LFHj9JTzK42+cgdh+XCocdwrIlvOFp9lY= 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)(136003)(39840400004)(366004)(376002)(346002)(396003)(478600001)(66946007)(66476007)(66556008)(4326008)(956004)(2616005)(83380400001)(6512007)(2906002)(38350700002)(316002)(38100700002)(6916009)(6506007)(6486002)(1076003)(26005)(186003)(16526019)(5660300002)(36756003)(52116002)(8936002)(6666004)(86362001)(8676002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: H2ie5bwtPVM6NM1gvw2Cv9fNqGsUfobkS49XM/i36Sny8yJ4nFcv5hhNAD8s+PgOq4JDK1zb4xN+3WBz6gK/5HkvY+LiFQR0C5Oe+2/p1jnDjmCHdgEepgePkHUAOoQlGDybFQpGLgH964krCIdDL9AeFzlhc/oElxFO01W1ZKCzDQeEdzXpOKcLCiaRL1yOHXeoga0UPd4kotVd20RwdMofBtMZ4NPDe5p3EscH7WzVvCaXJ4EBy0xuzxMYCRkxAMDn2FX8tpJzllttbdJsYdvihf+hwsZndEdIjWSM1NjwXJ79pDMbOmt/F8IPAPozEXo/mqq9rmi/xLw6y3D+iPYt05A36qG+/sBp6WAKTlqXOdiHK/W+c/6fSRe49BzzjTn5Tlx79ry2/RJOP5YM3LVilLfXnV6os/KD7hvbm3KqHUQbFQHplg9d9Cm2GDbV8U8VQ5uT4muSCEuNfSFdeDJrIc49v1bD230kcRI7gQhxd0lhswqvs41GNMqppa6ACSPVQ0JeejInRM87kxOFaPJlWWfrHbzRgHCgTFkrHYQ4nG8qxONAXlltg+N9yODsTgPomE4yN6Y6nTmiB/0/LE6EN4aKzuqg2UPF8YuT1/M4HBNt1yJmRW/9iuox/lhaiqEz+TsIK2Lo30zc8HJrCUpkX96SIJCH04EXQM0OdhgVlxyCZvA9zMkcL/Knf2qH/5WNR4l3p8gPZjU1F2WWNoRbDcKleqbmeuv8pMKn0Q0Xfz8TtYxQpwjAI3Q5URQGRd2TzyHNYWO3OI6C0F0SZZdunxrSukC0UVaIs6aEElm3ALNt75MyavTJXhoqMUDyZvk9U27Th7a6Ig67zWySZgJC1IRFoQeIfztCQWjiplrzWejJSS5+HJ9fpNbox8Z3nZ4Q2V3q1bdpGmPoekxnklU202rMY/jqdcU7fxcaholSPwlpBxJsADRLPDo+MsIJFm6iN5vnUD8vjhUWjP8A4sL6BslxsWZxQ2cQ8JxZjmcaQENh88UJrqxtmGW/g6VIJO6zlOym0TyZ7cw97rc6pUKkuGcPsUxiNmSgSf71i9zD413BrhXb4MzEJpbuIyhosNACGOoXoHDsXnnh5pKpCz7wo8jbbV4QfWYB53T6JGvh2t/SAJZx1HRXlkn0ytIOOAg1wRWINzdMLX3eQol7Dl8DokKhszO/jn4vwK2k9ujK/OeAf3UMHeZmHOaimNsPPl0q+OTS0GAXrdAHlQlfL4z2DnId1xBbFDSSdRYGHhtL0oq+dPj1rXDum/7KovHDmCCKPKqqkPZREdsUCAQ8X3SbUG36n7PUvjY0vsNSZdmgEa4SzqplbcPwRAtiknUT X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5515c7ed-743c-45ec-679a-08d93f958abd X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 09:16:16.1116 (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: KtObQDAcqjCSkSRREe/zx7gU/hjXa469VB9rKJunPSZD+vYt+gAkqUo50913c6Ku7wPIAY91sc1vpczIj07YKY7hpsVkoF1IljfSxbfrM/4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4470 Received-SPF: pass client-ip=40.107.20.138; 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We want iotests pass with both the default zlib compression and with IMGOPTS='compression_type=zstd'. 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 --- 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 | 7 +++++++ tests/qemu-iotests/common.rc | 14 +++++++++++++- 7 files changed, 40 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 ee30da2665..11b6404186 100644 --- a/tests/qemu-iotests/061.out +++ b/tests/qemu-iotests/061.out @@ -524,7 +524,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 @@ -551,7 +551,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 @@ -566,7 +566,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 @@ -582,7 +582,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 @@ -596,7 +596,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 @@ -611,7 +611,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 b70c12c139..f8e2e039fc 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 "=== Testing compression type incompatible bit setting for zlib ===" echo _make_test_img -o compression_type=zlib 64M -_qcow2_dump_header | grep incompatible_features +_qcow2_dump_header --no-filter-compression | grep incompatible_features echo echo "=== Testing compression type incompatible bit setting for zstd ===" echo _make_test_img -o compression_type=zstd 64M -_qcow2_dump_header | grep incompatible_features +_qcow2_dump_header --no-filter-compression | grep incompatible_features echo echo "=== Testing zlib with incompatible bit set ===" @@ -75,7 +75,7 @@ echo _make_test_img -o compression_type=zlib 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 if $QEMU_IMG info "$TEST_IMG" >/dev/null 2>&1 ; then echo "Error: The image opened successfully. The image must not be opened." @@ -87,7 +87,7 @@ echo _make_test_img -o compression_type=zstd 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 if $QEMU_IMG info "$TEST_IMG" >/dev/null 2>&1 ; then echo "Error: The image opened successfully. The image must not be opened." diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 268b749e2f..78efe3e4dd 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-000000000000/" | \ while IFS='' read -r line; do if [[ $format_specific == 1 ]]; then @@ -332,5 +333,11 @@ for fname in fnames: sys.stdout.write(result)' } +_filter_qcow2_compression_type_bit() +{ + $SED -e 's/\(incompatible_features\s\+\)\[3\(, \)\?/\1[/' \ + -e 's/\(incompatible_features.*\), 3\]/\1]/' +} + # make sure this script returns success true diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index ee4b9d795e..813b51ee03 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -697,6 +697,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='' read -r line; do @@ -996,12 +997,23 @@ _require_one_device_of() _qcow2_dump_header() { + if [[ "$1" == "--no-filter-compression" ]]; then + local filter_compression=0 + shift + else + local filter_compression=1 + fi + img="$1" if [ -z "$img" ]; then img="$TEST_IMG" fi - $PYTHON qcow2.py "$img" dump-header + if [[ $filter_compression == 0 ]]; then + $PYTHON qcow2.py "$img" dump-header + else + $PYTHON qcow2.py "$img" dump-header | _filter_qcow2_compression_type_bit + fi } # make sure this script returns success From patchwork Mon Jul 5 09:15:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12358613 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F9FDC07E98 for ; Mon, 5 Jul 2021 09:26:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 154B061248 for ; Mon, 5 Jul 2021 09:26:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 154B061248 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0KsL-0005lI-2t for qemu-devel@archiver.kernel.org; Mon, 05 Jul 2021 05:26:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0KiD-0002PD-NP; Mon, 05 Jul 2021 05:16:21 -0400 Received: from mail-am6eur05on2098.outbound.protection.outlook.com ([40.107.22.98]:14496 helo=EUR05-AM6-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 1m0KiB-00087O-T0; Mon, 05 Jul 2021 05:16:21 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m6mIHVy9HkinqG7BfGCWu8kCG/ErWAqGt4MSGffYL/BuNTRIjp+sFNIC9PyYcJ6wKjQRk++rlDJbEtjTgDCXUJCNw72F4Y5yYxTZQhC5E7BUUxFJKGNZuSbpW6VVB9qDHM+kwVeL12ufsR4wH15GdYEWmThnToPfXO/3Z2ucWlFJ0Fw9iQZuQJrjBnRGaKwkwZoGHaldL38jdsQmzYURIxvcyG9EsB6MX2zWG5Tg0HW1fmT1lZLLi8ACvtTM9G8pXmF4ZTNHrm4/9BOcEqjxpfK2YJQt/+RuHVJ3keqOeOAlN0w3jv9kbRledtmrWxwdz0Nwqam6wdmiYFDeYkvPYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2RT8Z248y01LkN/R5oqnFYFUeFaGlpKitjk0b2ZU+Gk=; b=kzuXl/VddSQ5MyGpCxx0j8aHTxpqms9fzgXWLV3iX1Ov4VkmeTlcZ0Vd/pOf1N7VkRSwd/XJjrxxYVAhdglgjeEhW/CXd91ZU+qGUu7IB6c63WcHhDgCl+/MrEfXgc/BMEf86zFIhLXYjbZ/kkGh2iTnhbOBA93I8zuu0okz9t4iGGzKwknpzqDH6F4eShnwmJV2nYSnu1nClLKn3gK7xKHyyvgIJWhmvsdynaABj6J4BJO4TWDuon70N3VGlO36q3+nj73PxenNpO8/m/jtB79wF9opmQseuSEP/FofKhsx1JBOtrht6nH9lGPjXdzYhCj9XIq9D9ysWsHo5ZCGSg== 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=2RT8Z248y01LkN/R5oqnFYFUeFaGlpKitjk0b2ZU+Gk=; b=YOfsZPPZ7c3t8PGkTPuEJZqIkH87GxtJIU4rZaufZ/p4g1LNtHBupYSupjiJxlPGRzI2QMtFjdrz+reh3xbuYVBeLfTFp50RMuai4DdT2LqxGAEExRXI9K4j+IxWVRpQwDwSXPwvP0/2GwAAVrQU/MMZ7/PQhZfYBcjCehMd5DU= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4533.eurprd08.prod.outlook.com (2603:10a6:20b:b5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.26; Mon, 5 Jul 2021 09:16:17 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955%6]) with mapi id 15.20.4264.026; Mon, 5 Jul 2021 09:16:17 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, vsementsov@virtuozzo.com, den@openvz.org, jsnow@redhat.com Subject: [PATCH 12/14] iotests 60: more accurate set dirty bit in qcow2 header Date: Mon, 5 Jul 2021 12:15:47 +0300 Message-Id: <20210705091549.178335-13-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210705091549.178335-1-vsementsov@virtuozzo.com> References: <20210705091549.178335-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Mon, 5 Jul 2021 09:16:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b6f8ba82-88ba-4b6b-ebf5-08d93f958b5c X-MS-TrafficTypeDiagnostic: AM6PR08MB4533: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:256; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uGNpGGcJT5NyFLBtgYy+h/IjsF3s60rweqinMA3CwTNcfmMlEQyxns2y8OdppNEIC5CmK3LjDpgK+8T3m4fhVP5mcQ4uO7i9NeILn0srll3/bvQEc+vSTrt3MFMPHegn2q+RyosE9cKj2oxzmvYTZbkeP9IxcLecrbFmemK+llaqP+ATRUnE3XtLRxY2bDTgSp5+g1OeFkWf3wDdmMY250whyHpoQ2yHeJP2GPytZ3vghwsQ/1xtlI3OYVfz1stFIF4JCtx3dLJd6Mpzfs8idCv4bEfE7R1NcEGc4KTeJsdvCPCVaJP15EfjIoz3a5l8P/JZDsajpx211O45BmFiR8HPQ2f5NcwACx/RzA6+eVEQM3ZBULRDCIWps8OX9WjF8XfVeMD8LTQ1Tbl18KO5dUctcpKygySKIt0UvgoYb81Mf9QFfHZoe2Bmf7/l29B09dA8xS+QAkxL7Ovw4oTIZLi0XS+AYl2347jTafyF6ygMjAihwrOsnXa1PIO5ciUilz0rBJqdHtOjf0bWOMZugwMSu5n/HW06diOBJZMPQIVapiEskyZm9bR9+OfQFWsCPhl4DaIP4+g3wqGJ8/0RF7TTpXJa0PIagfpqQW3t/oLUjMWdDdXLcbaljBGJIlOkFvI/R8ouiwaPFRNnlcfJO4Fxm/nE7+u7bwlvGwvF0JxHeUnXAubs3TK1P2tQKlVpU1Ip8HZCvqhwSjuM7yJ1ty+ES0S45jZD/4OJCVX1RYgpKI6DH+/Aj/aYNqzQSojC 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)(346002)(366004)(136003)(39830400003)(376002)(396003)(52116002)(6916009)(2616005)(5660300002)(66556008)(66476007)(83380400001)(316002)(86362001)(36756003)(956004)(6486002)(478600001)(6506007)(2906002)(4744005)(66946007)(1076003)(6666004)(8936002)(4326008)(186003)(38350700002)(38100700002)(16526019)(6512007)(26005)(8676002)(69590400013)(14143004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vibEoozI95ElFQfwarzz4vydrXMBFkdYy6g+vMNT/EbEwb6j5AQ2qHEVwNKF2DBqIAyGC015A+qWCL8C7T9mrFUL2xD/9BvxV6zV4f5DUG4yO2RIq1wa+x7+5gfIKOFcx7RZZBhlGYc0bUZGPzRryRyoWwmX32UD1S5MgonvmHpDZhYp4NyQwzzmAnY7/RRu2SlBbdAEVrbcQPw8CiEW4B1kDDTXzeFjvXsQuepjoVjd+IlI7gMEXZQMgpfd9VxQU5A94pH7W0cxWCIr+hxcoH0qj2hgNpbv4JqNcmeEi18pgDuzDtrn2DNn15y2WSVeO0ryaz8bPsLqi+68PEqCbgehY0vQVLYetnN9A8I0Yhg2dNfp71s746mEZxyqnJ3xxwvfDXRpCT0fX6mUxPeaTIOw3W+4NvycZFuu6hlqqS2zlxK/ikc/En5H0XheYN5Kv1rkKxqreY9EEPnsD2XLXFn+fY5eyKiWP91I8eUTsrm8w9efu57nzj8PNrUfyo4feuakzG29EruBT2k6R/hEF+SwrzoctADek0QrZQ+VQjrgI38khaMKMOBMtRVXk/HkesJNb2jPDgMnleI7F2ScmS5znHEevtwArh5EHsIhEiDRcR0CR6M+R+P4exu3gUijLFYuUd+HIjuaFs6tfgCnqlCCghHWCg3QxGZjyVvH7YQPwotZ6YvfOo4knCEvWfEimGnJJNsWSLdtOz0x67St0y3hFLo436ofPkIX86EUSfmrlePNE3rEomfFCY+uef0wHiassjD8n81eFc5RQrrGBjD02+0jWre2/mepQQ8yHIaJZjBtsdv7vVy0foh9WIBUSu0BLX6/T6nnQiXfJJc4W46dn8jx4MN5Ya70uo/a1zHyPngwDuhvaZNZouwImMC+uA3lZpKC4cwv+IHd2F3/zL2PcFk8fasINnbUaF63Y+WENyhRPeK931LmyNLq6LSK62RWLR7inumgC5tdPQh6N4UTSMK2/2IU2BC183ua8cxZYvMeaQbOzAte+qldN9Xv26yygW0Qn8JD0WZVSmSCPRNyAWFuP+p0P7ApdBYZkpcOzHxgEZ1ilDkabk2Zi2diXXg8m63KtYimLbqzk3z8Dgw/E2A/AiN7R+g/nI94fDB2cyyEZuahKaHC5AGWKquO+9YBzB7d1ayg5nfBI7vLNdN6pble0Z8sGNvILnJuYeXoqEyu2toNNg0t1i0FO+Y+o0byys6AdQd1/vI7b7ezcMrPpR1mAf1P6ekqre+buZrCxRDTqi2BHX+KzDSv6Ek7KINVYNtB2xFajuErfBVSr9cC6R69VCqueoAU/K3qZL+o4yKNQz8S2fuLoXv/f7if X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6f8ba82-88ba-4b6b-ebf5-08d93f958b5c X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 09:16:17.1938 (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: Wh5IWIf+XD5swLupIQtWecuYPa8L3acA+CvnE2tb7vRvGuxLfELXsAsCj1Oh4+3psPegs4610y+rPWwMpYRyN3jUMv4dumIoKZ7fCiVRzSU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4533 Received-SPF: pass client-ip=40.107.22.98; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-AM6-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Don't touch other incompatible bits, like compression-type. This makes the test pass with IMGOPTS='compression_type=zstd'. 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\x00" # 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 From patchwork Mon Jul 5 09:15:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12358615 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42D63C07E98 for ; Mon, 5 Jul 2021 09:28:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B3078610A3 for ; Mon, 5 Jul 2021 09:28:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B3078610A3 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0KuP-0007ly-RR for qemu-devel@archiver.kernel.org; Mon, 05 Jul 2021 05:28:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0KiG-0002YI-4s; Mon, 05 Jul 2021 05:16:24 -0400 Received: from mail-am6eur05on2098.outbound.protection.outlook.com ([40.107.22.98]:14496 helo=EUR05-AM6-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 1m0KiE-00087O-Fj; Mon, 05 Jul 2021 05:16:23 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ewUxPf7WbgbT7L8ksRBJx26XqLHotPwc7IkarnE73QZuzW/WbqTRGq9jFAP6RctjzO/9flLkJO/mqDT1M+HAIbsV53K2Gf4lT6YBznDLsquI7UR2f/kyurDVHyF/Czoti1ndTV9chRtCUsyIV9uTG4I3dRp24BlOFIhWggC0IlmrU4tK7EG2RpkLPe2H4940HfQWlCp6tKjWcy+bT/FF2eO+xkJ5l8iNCTFEXIXYgAG1WtEXz9H+1uWeG4Tji813mJwaO9NtXI/EBa3TyMeW9ClOWsxuLQo1rGyqpzjPApv3FuFU3AeqPNOgzw8PzFuE1Pl9DVCp3tziAvEllGhB1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=P8z5pRLsQhvwoEXWI0qNxN7H+23lYIryUkTBdMG/Mts=; b=I3FdA9JIjIohuOE4kJIileG6Q/RGxsUoe/zhz3pcEhLdlQ0PypaS5KECo/YNXUyYJcfI0JjZ31HN/0ZRxfA3DugAYIZtVaE6KbxPpGXoWCn/Opu16ayzk03Bbm3K/k+1F+Kgz46WteKMxvDnQmf/PMqDJnQg2I11BZMZSZWroJYZ6eMGcaZT2lAXFGAJdvc8CbRTEHicbvogYGUTual0fQ2cNYr26E+VKnVEkpinGmmnpgZaRKKxX2uXLJEbhoGbp7Z7tCHJGKAwr6aq8a6/fUE/Jdbscd8acd2OmQsLYqRkLPdJGeiGMta2RkcM+1wdV+obLPL90XpnDoa3epTX0A== 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=P8z5pRLsQhvwoEXWI0qNxN7H+23lYIryUkTBdMG/Mts=; b=JdQGI9cX8oBbsbFdexfOrIFdeMi3IObSsOIwALehlKfY77t3CE5LTFH/PdYEBhZn/shG6SOuSa3uMMWlXA7WfHfd6W2qijHxUyW7VtsqQ1JS45kTRnstk9yueDJRd23iWNDCj4xYy+BIKmVRhbIdLRM8ntro+BwQNFTeH66zD/w= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4533.eurprd08.prod.outlook.com (2603:10a6:20b:b5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.26; Mon, 5 Jul 2021 09:16:18 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955%6]) with mapi id 15.20.4264.026; Mon, 5 Jul 2021 09:16:18 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, vsementsov@virtuozzo.com, den@openvz.org, jsnow@redhat.com Subject: [PATCH 13/14] iotest 39: use _qcow2_dump_header Date: Mon, 5 Jul 2021 12:15:48 +0300 Message-Id: <20210705091549.178335-14-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210705091549.178335-1-vsementsov@virtuozzo.com> References: <20210705091549.178335-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Mon, 5 Jul 2021 09:16:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7b1473ad-ff68-4be9-59ad-08d93f958bfd X-MS-TrafficTypeDiagnostic: AM6PR08MB4533: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:47; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XAfDvHbIVhWeLdLJP1z1KwL8z8xGvrF+Kx0nPB9jqyHpA87/O+7jEyOn8r4uGroZP840GA7ZNU/YevLDj5TWyZBz6X+clKaTQyVw2R02ism7dWHA/G/plhghQzSbixtBBoecor0xxnDi6VMD7XC2ZOYSbL0uv4M3xepiVdGjX/LD5J40DJColRDHnKwhnQETmI92RUu2eBQPY/OpyOqFcLIkAsZG47+D1vZkmtGGGxX5ED+H8/IuQjmc6gI7u2HYfzBLxReN7PvbV7Ac96CjodlrzqdHArxsC3PoNJoZOldS4hAqyX1NqL7TWNZes83ry3c26rJzYZTjnvhHtIz4G6vysEMM7Aaca/nNN0AClBMJn76eMMxkTsAoCIJd3lUKwALvW0v5kB2VbdxwGmVLd7o5tHsTqxMMJnSIVC+sU5CI3wi0EpSFtpCIN4D3mq6WhIGDbuoIEvLZCLNbwWErbQRhr/50BjB9SHtkt4H/oj6pTqbFTSdE5tfpTLzxXVmotVrvxPc571SfrCfk+cqcJWswkPcPpFXB9nI5QowfHtQiI8TUXQDnMK91kHh/NtOtRYfWc5Cx4L5EMcpnVHrCbAXD4I1/WROaSalgkxu7q0D1FFPy7eZlK44iNHJGtF5w8MC1HsRiebma0NictT3BJ+wxQbyRZrgvupQfzq6v7/bSJuNBvUdd2PF6yRxDL4tUDrIx938rQVCJZqFTR/BaeKKkHIGa9cJxbQ0HsWKfZBc= 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)(346002)(366004)(136003)(39830400003)(376002)(396003)(52116002)(6916009)(2616005)(5660300002)(66556008)(66476007)(83380400001)(316002)(86362001)(36756003)(956004)(6486002)(478600001)(6506007)(2906002)(4744005)(66946007)(1076003)(6666004)(8936002)(4326008)(186003)(38350700002)(38100700002)(16526019)(6512007)(26005)(8676002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WzcCEYcwk211XQLJZvxW1W9IF36Q22OsawG8Jf5h41OdnGpYdMdnHlzqvGiPXBDsRVPTLWWURnSIWEbpnnrrQt/TRM7gl4JvecqvuHM941Q5wsYF9eIc2Om9zPjgX4widWux+Nkezp6w5WjmRniyZJP86w7jjKIdZ5cHjexkUHEmnNJiUuil63hcPVv8At3B4xpFJ4CymjqJ/FE2Pf4Qe5LtkACAE5Z80O65kxNfLETQlPEircx5ByT9b1bfxtsniZsSDlp1srbMKHBnQaAFsRco5NjT7dEdOVe9MXdymoiQ1s25pNaY8mYkmBvlBYD1p/dHUHKDjliDSQsGMXXPp9mMkkZcgfTNYLYlzXTq2hHQCkw+bukubZb009i5xkySoj8ptAwOEqK/5Nz70Tmkk4GZW6Y2/XLG4mc5Q2rJOay2799Lfvy/is6TWDORoip9kh29A9KbyPV38oss/c44mTd/uOmxn+2YMAin732HtiPn10MVm7WbSdwPeBMxXzFkv3TnBPLEQEZGjk20K9E88yBw9obnUbMnIz+PvlDiE0Onesg0swtYEXFp4+MT/UFm6nAk+xthhPmYtCyxqe3e5QjbUScmwjRIquK5Iq3C13ME6vSR8cPXi8I7pJU93PYDKbVWp0uK1GDmEZyqAnVv6/YzEqmOFjkesa+puvuQLe1YPRCkQ7MohdozlX2EZ4NxkTdtmTWJgx+4udSxlwYEENtHNsjaFgOkVkxXVCR2HEZ5lfFmyrAyiDUv5GA2fzwc3jlC+4jIiCn2Lmt2+BHnuN2e0r6GbJFsOZMYgAeuvVfWGwRuuLyuuDhhhlc68sC8xQYqdvN9QnPbppkDxAKFR2wbOcYOW3uzF6Tk68rQwdD1rlXpoep2Ha0gNybLHU3O6CkLEDUvojpWd+ks/3VvRIS23HzjEOYignv/TMssu7Y6TYkgz2taUq8oru8mhCwDJxXTiRDV1FHQ+Dj6mJ3qOIpxekLw/xAMoCJJGQTORwFAwykTUgLo6cQpkksmiDAaoMS8IOxwR/a6AEOkf5FDiRy3F6gOfLHewoXFyy64qvOg2daORY+iT6tz4ntaDzvZKpQ30vCPbXXs9F5GAaQI7aaEo/OazMvm3dWPEFf4a85UCkLZ8AIMbmXYYycCNMXJLncZkysPiBz4RI9Pw7eqlLE8BNwd77hfpVyKwIcUa3nnlttq5kZqyOyECMDZJL5r73H8R7QNggVM5NlyMzvmQ8k4Ai89m0FT2AXrd3ZCzsqRrHmG63138VQFyFP60qOchbWQ/gWSi6Ci4KZvbE6vA2MqvltXQByPyozyfs+h55bwFYg0W+MvjzqQsge633Hd X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b1473ad-ff68-4be9-59ad-08d93f958bfd X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 09:16:18.2612 (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: FTN/ZMAyvTqc8e2iROH7WBoe89t7QBdEqrqR7Ej2YBoP1alwIaMHCFlwdkyKFIDyrnX6Nmzwhmu6fC/vwQNOQkKALXttwNGuFb36RIc/ntA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4533 Received-SPF: pass client-ip=40.107.22.98; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-AM6-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" _qcow2_dump_header has filter for compression type, so this change makes test pass with IMGOPTS='compression_type=zstd'. 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" # 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 _check_test_img TEST_IMG="$TEST_IMG".base _check_test_img From patchwork Mon Jul 5 09:15:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12358607 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E4D2C07E98 for ; Mon, 5 Jul 2021 09:23:42 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9534D61369 for ; Mon, 5 Jul 2021 09:23:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9534D61369 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0KpI-0001P0-Mb for qemu-devel@archiver.kernel.org; Mon, 05 Jul 2021 05:23:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0KiI-0002hI-QR; Mon, 05 Jul 2021 05:16:26 -0400 Received: from mail-am6eur05on2098.outbound.protection.outlook.com ([40.107.22.98]:14496 helo=EUR05-AM6-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 1m0KiG-00087O-U8; Mon, 05 Jul 2021 05:16:26 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fdldybjdSyylxhZ8EcD20AONtnb1jSRfLjdS8+gQl6Ub6BWX4XU/Cbv29wNJ6c14G7YS/3Km6LMgLHlwFFcmt/0vAtZ/kb0v2FycUJNBKuSjhkECeY58WQd2yw/l9Ql6VEL7tEv8WStl91YAEvI1NLo6ZpVVrD/I8LPw0kc1pvkiK09jGfCsndtEDi/YVz302sx7KgLt20hu10BrXa0UaiE47M21GmnbP98a39W+blGbWna7Khy53788eHRebOo7Om1Jdn+ZYeqENX3fgAfGusdeAGhQ5Jl5P+IXxYp8ISNW4qSGsCpz0rC6AlzrOZPsiHIsShv1bBlBOOnl92MuaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rzXsznZuoqk899hJaKpDnXiNLTD797gd/5g5Lqbvow0=; b=Z0mG868cGb7DQxa6XD3ryD+Z7/yRk+J5uhnT2ZarPd21zW1XLXhXC0/qH4bAU+xSzn1tImZmM+tHxs5JRckNCuDy9NHJaXDkhlxssQPOCmCOU20BCqHlYWyChftUAAHR1Gp/PTIRyBDsRXlqS+V+xuVVd4x4USakU684S8SOX48ngSoYNlLkYp7gX8kncPvA7ZD1N3GPDZuf2ZQN5KeYnFpinVQq7l1kVpZX5Fjz7SLWPMAnch9ED/hwXjjo8x7iEsMZDSdQ9JS3IPJCwcmdgeFTt0n8db4W1s1ER6kyD6N4HRNYPy5n1Hfyr+3XyxomDCU8AlXyhaZ7/0UHMoGh+Q== 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=rzXsznZuoqk899hJaKpDnXiNLTD797gd/5g5Lqbvow0=; b=HmikUP+JlvG1YRY5PI2fLpFRjgkcTNB+o5HDalKiDXybrW4eDagOvqURIynobu4G2s6ZuhEGLCqiWzc/HM4a9/bM0jwGEmyLrY8R8/ysVsq/vADT70WLJo9xFOI23Nk76qpticOl80TX5RLrzzEZ+DE062MqIz7+kJlInys0rvs= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4533.eurprd08.prod.outlook.com (2603:10a6:20b:b5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.26; Mon, 5 Jul 2021 09:16:19 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::75ce:1d52:cb60:e955%6]) with mapi id 15.20.4264.026; Mon, 5 Jul 2021 09:16:19 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, vsementsov@virtuozzo.com, den@openvz.org, jsnow@redhat.com Subject: [PATCH 14/14] iotest 214: explicit compression type Date: Mon, 5 Jul 2021 12:15:49 +0300 Message-Id: <20210705091549.178335-15-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210705091549.178335-1-vsementsov@virtuozzo.com> References: <20210705091549.178335-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR05CA0235.eurprd05.prod.outlook.com (2603:10a6:3:fb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Mon, 5 Jul 2021 09:16:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d474a258-45d9-4bf9-76a1-08d93f958ca4 X-MS-TrafficTypeDiagnostic: AM6PR08MB4533: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3513; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F8kItEGjWfTbhdp1k8vnCRHp21GQzLmfRA2FwAG4LBYFy3gKr5zjt8v+zYUJfHR8PlECbB+RM3Bu4bPLyh+vaLYkBv6VEEMPRs9DdsDxP+HIT9W3AZ7vfIljufsNtYEAoD+Ege1sMoR76Qmy6M6fMEUFxr2mlFCAuT3m92BYlrZSz53yfQYQ53mO9r9jZKR9u4hAOlVzxPqpDB2fOdLGZFPKvdRkBoTPmxvjvpboJVZ70u1Z1XuvifkYh14fFh9o2FVRsM8nkiCCfnhmrSFUZaevWIibWFAlKJ9k7VPbfyGziV5bF1tm1jULSMLZGgM2sfbikhCrYtwPFVn8YeZpFTV3I5zWnE8fcfaCSgnqirhRbVS36vLtwW2dw3SIwbvzDNBDXdFTWWuXzAS1vHZLFjJ5qvFxrH6hIzBXomz1yV4MKz2QIHFeeWExQ5j5ZV6p2dNtbTq0YmCzjZo7a01x5RU8SuXhUU5xvdAPydoVJfNvwYMmhLmxhyeLgV1mFEHD/mger78sSzs1gaaH05MLI8uiiyZOFSDz1DcH0P/i9bSG2IZI6neSnmbh15S5X3HGRuQprdzH/BQoOFh+jYkWcjdQ0E4Ap19xd377lLTUXnvmXU5nBWhoP7x1mniljRiIs3bVd2hb6elL8TBL7n6qfAx7+un+nhVTdxP5GZ4aAhTlfD9bM+B9m95Zsk547pFUVwbVyFcqg9x1swuTYLHkojUVDFmT3u3fDgmrhl5s0l4= 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)(346002)(366004)(136003)(39840400004)(376002)(396003)(52116002)(6916009)(2616005)(5660300002)(66556008)(66476007)(83380400001)(316002)(86362001)(36756003)(956004)(6486002)(478600001)(6506007)(2906002)(4744005)(66946007)(1076003)(6666004)(8936002)(4326008)(186003)(38350700002)(38100700002)(16526019)(6512007)(26005)(8676002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: p282jGPf+azFqgA6IiUsTDydJ1gR0qjwCNLCj3C48r69QEITBqhBltWV5lKLQ7iNyjbXH7lG2nFrbzZfnNvTpiwippq2cFzPYXxeh812UZ/jpY1770kqyv5+clWnrcweGeqVufZ2dX6e4380AFge5MPGcDoq7gt7gF9HwrN5lpdq3TAw49lCB907A7Ix+sdyzOv+baMAxxcyj7KgJfR94/bQc0gP6dYdOc4h1xE4eLJJ28oNFAzmZCV2JD5nS7zAaG0KpVBKOP+N3GXQhQ1waN3rW4oPE5X0DmKRmp4N2oQuD4WP935EN7hwdWMHUaRNfAgkTEg8e3QkXMigHeLrfdbsMgXAh/lSdmFtIkoxdbSC7kQTRryAXH5MR6jnQyQ2RNtPxvc0/NhFqw8whF4Me/pJBLiLHdwI3N1aHpMOx3Q/U3HcPnGeTYXAaNbExT5bHXpDbb8mtl+sprniNzV9Zv2w7h0maPBsC38i/pJOJzkmx9H8UCW4Gh6t4MeDrldUcRoPHQ01zOHCVWKDqAS0LLcV+raZ1RQH2opj6arxyedRrvTKtDgKMZixbVQbQ2N9REaiQ7sOjxZSHyMWShBLnpt48Bb0k2F8Pyy/iNVZHD3utezKjKUdbRik5Cz66x5sMMYc1VwpEUCPlhDQC95aVqpa+y0VLOdJKW8DMdClqUxfT26AkYcspZxtXq8cMAo0onP2AiJmVs/vOKMhKH8G25UqP+NjxUNjpX6qOkkQN+oGFl3eLO7MebOK3PVZC5nvsPEEMczEm+6OXUcA0AZM33FLbg5ZVESKMMjtkcbT/5VzgoRYW4bYqDjhVTeecO0Id35KUTbUQPA2UAwPzq+wQMQiquPHQFjHscXO946aFZSKviUHIUn/jZkIdCDaDYXqCwVw+wb5PhPYocbL2Q9MxQ9hVup/OBSNecuMSSWaQSmZRMwNAAExPeUi07JB2FBsCPUMZKmcprA+RFjhd+6FhDaikRDQu364yuVtzLbnLkhqCCyh9X88C3TwfnIScwMk1XKTccEAE5uDLR6zqnuAF5yvrt9agovfY1virqWJBLmBQC0p8YPXRlNCJViddrSrNA+BNfUjcK1qzVKxVhW/7drCytuVlN0tugOmrmcXn560Gpks/hPFgHnIe6bm7XLVLsv8MZyKpOo3ngMcPsWT6iFX7gVyP5B2n80u8eNoedvRZf1MPQb9pPZqpL4Bq1kWRAsuANx1PNLB8mu6v8P4T7UxTRyGWEUrhhvRgMAFMd6wuuLmCGr2fChUWkL9p44H6n0sFuXkTjJFYKktLn9Rv+qRsbZxD1RA9+JoaLkIHAJgHhVoo0+w4lCzmLwUgmoJ X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: d474a258-45d9-4bf9-76a1-08d93f958ca4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 09:16:19.3653 (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: pHtDU5U/7i7/miuHo6nAv2EItEEpRM3srB5SxLQ9L6EGkcQDWOlsLuxfCYERX6qo8MbOY4qDUa0AHDNe2bU+coX6oYMH5iuJJtET7zADoIU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4533 Received-SPF: pass client-ip=40.107.22.98; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-AM6-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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='compression_type=zstd'. 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=2M +_make_test_img 8M -o cluster_size=2M,compression_type=zlib $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