From mboxrd@z Thu Jan 1 00:00:00 1970 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=-19.2 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,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 892B6C433EF for ; Tue, 14 Sep 2021 07:47: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 C71CE61283 for ; Tue, 14 Sep 2021 07:47:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C71CE61283 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:47894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ39x-0006ZL-TH for qemu-devel@archiver.kernel.org; Tue, 14 Sep 2021 03:47:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ37n-00058V-39; Tue, 14 Sep 2021 03:45:03 -0400 Received: from mail-vi1eur05on2097.outbound.protection.outlook.com ([40.107.21.97]:12672 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ37k-0000dx-28; Tue, 14 Sep 2021 03:45:02 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nXiVcmL8hvLXKjqoNEYBJYis3wz3S0afM4UvBcFmJ/5+PebGTrKgx2HJuj9VE/wt1I/onNy9DappI9eClC2UH443wRPUHkx03OCNYEOhMJ91TrVcaAOtM3dt92g0T/0NaQN69ae/vVA4qdDKMnEzg2sMqcOV6F3DfO6Y8Vypb5gJNFGxe4EI1his76Pvu8YTX7XYtVMVzydXIEps5TJfDgR+tuR+tPboXc2cJWjGNEJlzff0byDI8qXgcWdKylYHUYRNRm03A57MsJ0xsksduYhBIJ+Ww4pIsh28bI22Jp9OK7qW6YW3x7agtIfAqSxAqo0V100IqlFxT9e5kGL6lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=e5trcYHimaHrID83F8gmJzT/XksQbDaM1cP9GtYUQjQ=; b=oeP12e3jonSXOGKyFs4D02Z0CmRymutImTG1O2bA3IoIUk2U7zSx8qHGGnpgopmofKrm8DZ5SIofrWjOXHfXBFUDX5tZmAL+dwkbzR5QjiDisFt9skCu5ZDAK03TXuOQQ9SlU1XKNfl5ZWPvUrwX8fqDHPFGendRQfGO92wc8YCs3G5unv77vVOpCi7PaGkBJlcgLOH/4J721yWf9QsAASU+LMhZTwwbaNbZQrjAET7vKNIpF4U+snlIctspL/stdyW0JC07md7SzADK0y6D7h6DSrjfWhKl39Z44huLwybm9ZhV9+MaV0STtDZpEUjSmZNYBVTEfONnKmAzH8cs3w== 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=e5trcYHimaHrID83F8gmJzT/XksQbDaM1cP9GtYUQjQ=; b=SfKuy09Xwg4/Gr0NszIFJivrZd0a5zsf5qdXauX1lHsL/TrzQKtIC8frspDWH1fHTwvatqG8Tgw1FjOtmBFo3Q9EIyH9SA1TbJlRk3AT9vBhGXiACVQOWD3NUOCDQMxlorESxC9YEV5oZdCuEBLa4CW5rnEOx1ZhtOXSRwEiJ9M= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6503.eurprd08.prod.outlook.com (2603:10a6:20b:33b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Tue, 14 Sep 2021 07:44:55 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::2817:53b3:f8b4:fe22%9]) with mapi id 15.20.4500.019; Tue, 14 Sep 2021 07:44:55 +0000 Subject: Re: [PATCH v2 04/17] iotests.py: rewrite default luks support in qemu_img To: Hanna Reitz , qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, mreitz@redhat.com, kwolf@redhat.com, den@openvz.org, jsnow@redhat.com References: <20210720113832.586428-1-vsementsov@virtuozzo.com> <20210720113832.586428-5-vsementsov@virtuozzo.com> From: Vladimir Sementsov-Ogievskiy Message-ID: <594fa5ec-886b-3216-f002-37c2b1cd09ed@virtuozzo.com> Date: Tue, 14 Sep 2021 10:44:52 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-ClientProxiedBy: PR3PR09CA0028.eurprd09.prod.outlook.com (2603:10a6:102:b7::33) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [192.168.100.5] (185.215.60.196) by PR3PR09CA0028.eurprd09.prod.outlook.com (2603:10a6:102:b7::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Tue, 14 Sep 2021 07:44:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 142faee9-644b-4fa0-47ef-08d977538b61 X-MS-TrafficTypeDiagnostic: AS8PR08MB6503: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sJbBOzX7GIYbkPvpzwBiWo9u3iuMV9tskCY2BrxorVD0UIVNfUmOd4M4BMqnZNWF/60lulgdRNpyTYpE7Q9d62PL0uV0ZKhlTqXugyi3e+LXKc1VDjtIwokDqt/z5sVJleavD7A3OdPXLU5679hjqSw03uHS/3ye0clBIfZEwgot8/Kbr/q2rxCtF42SFLgwE9LiVkuxlDSK4rhens9qUmXOMW6j5rhc8zpLJwxszmED8P5P4LxkbnCrxNjA90IR0rwvIzeHXnlvK/1GmH4MbSkOMJ1c2uOiShG/QDcLN1ua28IRPafvPQzWUcDlvQb2TvTuO//Dlw2EmY6fni/+tHG/BTLLu+SEKZYjYT8l12TV1Po7yHDDQ1PHlXyDhfZVvA78tW1AWn/nGDFWT+80ChAc8PhPah07dmN5nfHxOwM3Dtu4GReINrOyKuZrAOT3K9NSFgAVHx3cd7ZCPqvUo8Ysgf7cLI4jfanB6DKV91zWuQOUzOKBTjXHR8eiwjmRyp8b0IIzvlvu8lOdN97upinwzQOiKRnHYHSoPs+3Edvn97EyZt+xRlSYs0HxoIsjqpJijvhMHmIS2DDJ/bKNyzcfSkT5hLTqqWFpKNqKdK7WRrfnyDhRhAtgISik/LCXH9nca+54fpTJHaYQFE+bnLbLL4bQKsZpXFWXFiJg/8/S/5sO+dza1ugIAvq8FBcXj2niGDtSSipK5xu35l2HqrK+yp4rMxJmBMGpm4CdzDmVjoDCwB+g1DWwne4ndcDluyTfzGUedAC388CnYlbQdw== 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)(376002)(366004)(39850400004)(136003)(396003)(86362001)(31696002)(52116002)(478600001)(956004)(2616005)(66476007)(83380400001)(31686004)(66946007)(66556008)(26005)(5660300002)(186003)(316002)(6486002)(8676002)(16576012)(36756003)(8936002)(2906002)(53546011)(38350700002)(38100700002)(4326008)(43740500002)(45980500001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Y2twUHNTVGgyekpta0Ntb2xwbUE1T0xIWU51RkhmajM5aTRPbVF0WmRsSmM0?= =?utf-8?B?ZVNsQVFqZzI5UDVJQm1OaHNsdHVMeWg5NnoyNzg5Q2cwWmxQRHNlTmU4TXU5?= =?utf-8?B?NHMrYjd1WU94R0VLZjREdHVUcUQxeDZkaCtGZGtFZU9kdVdWeHVsbnIvNjF5?= =?utf-8?B?cFoxUEg0c3dFWFBwWnhlMEpZOHE5SFpNQTlJTVlveGtFUVhVYlhvQ2puWTla?= =?utf-8?B?MFlRR3BYMStOa0NtbjduU250WU92YmV3Y000YXNMdFF3MkEyVWNTL3VjOVRh?= =?utf-8?B?Ymo4VlpzTzJlSW5yZGtaRWRJVUwyRDRWNE13azNIWnV6cmZ0a3A4MURrMk1l?= =?utf-8?B?VGtNdjRIVWY2NGc3T2FPZnV1enArVEdiQnJlUkk3RnJMOVBkdWNpalpTUXZs?= =?utf-8?B?MFEvdTVoKzdoTDBMWEkzcFRLVHh2QjNTcVc5Z0RqcGE3OThPajQzY1VEd0xF?= =?utf-8?B?QWwzaDVJQ2lOUVhpR2FKZ0t5WDNlUnl6STlHanBTVkwwNHE4bHdGOFpkamo1?= =?utf-8?B?VzkrdytJZkNLRXRrUSsydmVxYXN3clRHWVhQcTlPWlRKbGM5QS9sd0JqOTNH?= =?utf-8?B?NW95by9QY2wycFdUUVM0MkZFckFRMWtYK08yQkZsajZrMkFLR2hETUJ3YWZz?= =?utf-8?B?bWpFVUgrUkJXRHdUTE5GRnRnMHVPTEJ2UnlIb1RpbXZBaHp6Z0JZL3F6SU9L?= =?utf-8?B?RlhxU1RWNW93c3h3alkrRjhQdlpKOUpmSHU3TUJxRnRualIra0hpV1oyV25L?= =?utf-8?B?L0Q0QVdiMzdYdFNGUE8zVm1SbGNFeFo4NVZIdmRoY0UxSFRPSWNoSzlvSmk2?= =?utf-8?B?WmVBMCthNGFqNW1oTXNValU0NmJ3NWRCMTltRXZmT2FCWTZ4VWV2WERldm9Y?= =?utf-8?B?cVBFdE5MaXFKNFI5ZmxzNS9leGxaOFRkSHh3WjVYSmlYbURhVUdDUi9JUXpz?= =?utf-8?B?UFM1OFA1alUrcW5qMzlFY0x5RFZNeWpBT1h2Qi9xZURlNXFKWXMvNlpGME9j?= =?utf-8?B?S1gwL0NxSDFZU0RkM05VRit0alZ0N3d0V2pIVkZjVGZJMWxwc0ZOVlFxUkRB?= =?utf-8?B?dzlzY3hVWmpOR3QvZGNCUEd1RlMvZWZRRXZsNlBlNzk0N1FXZ2NVZHdMOW5z?= =?utf-8?B?ZGRycGhtMWtobklkVUlNNG9sT28xRVRHTFltYUFrSWVIUW53cmIyMitEa09v?= =?utf-8?B?Szc4dDhMWmp5cWNJSWk4SVVFTVI0YlpNV2V3S0kwM2Jza2hCWWZTSEczTGZK?= =?utf-8?B?MzdXeUV1TFp1aHFETXBjWGs2TmN0Y1I5cnoxeit0MWVYTUJBQ21UTUM2d2hL?= =?utf-8?B?TGxwYUZJNExhYzF0T1BiRkxuY2pqaGgySEVEd25tc0IvcnVJYys2TTdUWW9N?= =?utf-8?B?SVJZOElLdys3NnNHNXV4d0d4UXBVR2JoRXFON3hJYVdaWHhrM09STlBCODV1?= =?utf-8?B?Ynh3TURCb1JPUDBRNlZLNnN5Z3BmNnJHS1FBelJVYUZJaXZyTkg2UnpFcFJR?= =?utf-8?B?VWFYZ3NQMTVHSDFjSTNzSWFoUXJ4QzMxZVh4MjhjMVVWTDIyeFJwZDk1U0RT?= =?utf-8?B?S3FjbzJONEtQMi95UmlKekEyUDYrV29MbXNZTVZFejQyRFZBbDZ5QzRnUnpF?= =?utf-8?B?U3FYYTVSMHZKSXptZlhwNnMvN0Rjb0dsVW45QktFRFN1U0NFazU2RHgwakNz?= =?utf-8?B?clNwWXJZUXc1N2IvbjZ6bjNlRzdEL1BNRDNObWNpS3JEUVZYVjg5eTdiRUts?= =?utf-8?Q?7mNEtdyfB70aQMOXA8q/Qb0qDjvvWOgHo4GwiJq?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 142faee9-644b-4fa0-47ef-08d977538b61 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2021 07:44:55.6315 (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: dhaAPP2JoACzmPbbNFBUG8fdsu4z7kC53d+Xjsi6f9yvYwdiBUTzmk0vzBPe7IT0SSihJjjQtYRIyJNAMMMGdcTdmlalPYpaKh+B1abC6Dk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6503 Received-SPF: pass client-ip=40.107.21.97; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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, NICE_REPLY_A=-1.969, 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" 13.09.2021 14:16, Hanna Reitz wrote: > On 20.07.21 13:38, Vladimir Sementsov-Ogievskiy wrote: >> Move the logic to more generic qemu_img_pipe_and_status(). Also behave >> better when we have several -o options. And reuse argument parser of >> course. >> >> Signed-off-by: Vladimir Sementsov-Ogievskiy >> --- >>   tests/qemu-iotests/iotests.py | 36 +++++++++++++++++------------------ >>   1 file changed, 17 insertions(+), 19 deletions(-) > > Reviewed-by: Hanna Reitz > >> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py >> index def6ae2475..484f616270 100644 >> --- a/tests/qemu-iotests/iotests.py >> +++ b/tests/qemu-iotests/iotests.py >> @@ -128,9 +128,13 @@ def qemu_img_create_prepare_args(args: List[str]) -> List[str]: >>       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_list = parsed.o >> + >>       result = ['create'] >>       if parsed.f is not None: >>           result += ['-f', parsed.f] >> @@ -139,8 +143,18 @@ def qemu_img_create_prepare_args(args: List[str]) -> List[str]: >>       # like extended_l2 or compression_type for qcow2. Test may want to create >>       # additional images in other formats that doesn't support these options. >>       # So, use IMGOPTS only for images created in imgfmt format. >> -    if parsed.f == imgfmt and 'IMGOPTS' in os.environ: >> -        result += ['-o', os.environ['IMGOPTS']] >> +    imgopts = os.environ.get('IMGOPTS') >> +    if imgopts and parsed.f == imgfmt: >> +        opts_list.insert(0, imgopts) > > Hm.  Yes, IMGOPTS should come first, so it has lower priority.  That means that patch 2 should have inserted IMGOPTS at the beginning of the parameter list, though, right? Now looking at it closer: no, patch 2 is OK. It only put into result: 1. 'create' 2. -f 3. -o 4. remaining and that's correct > >> + >> +    # default luks support >> +    if parsed.f == 'luks' and \ >> +            all('key-secret' not in opts for opts in opts_list): >> +        result += ['--object', luks_default_secret_object] >> +        opts_list.append(luks_default_key_secret_opt) >> + >> +    for opts in opts_list: >> +        result += ['-o', opts] >>       result += remaining > -- Best regards, Vladimir