From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7071266692367646720 X-Received: by 2002:a05:600c:1910:b0:38c:bff7:b9db with SMTP id j16-20020a05600c191000b0038cbff7b9dbmr594871wmq.182.1647967587849; Tue, 22 Mar 2022 09:46:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c21:b0:38c:a3fe:5d59 with SMTP id j33-20020a05600c1c2100b0038ca3fe5d59ls1637962wms.0.gmail; Tue, 22 Mar 2022 09:46:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfa8zzNNtHSvqxchexBeqle7ZuLIu/nfWC1bNazv7E97bjroVKwZVhEcgZAxK0QdwxHT1/ X-Received: by 2002:a7b:c30d:0:b0:381:4bb9:eede with SMTP id k13-20020a7bc30d000000b003814bb9eedemr4660864wmj.74.1647967586952; Tue, 22 Mar 2022 09:46:26 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1647967586; cv=pass; d=google.com; s=arc-20160816; b=wHe0ygGXXckfz1uFFHLf0HFqpV3lAgqSy9CNPNtMkeJHYWcxGM7QZwXtF1vxVeLnsa ekICqKOy/WFHIerDq+SrO3uA+nd8pR1l4KYFDmsG97LAZNWEX5vY0aJM0UzFdBRJRBXx pZ6gBt3wWitjdQjKYyUG8fmIUxbTR1QGwGbrbXzcwdFDysndIUdOMQGrWVEaL/5fVpfl LrDTEPWmCqut7mBIKnIGA1BceBGx3PC9UQkCC7aXR1JcAv44wQqklm9vZYl/+BIG2/7b Q67cqi7ua/8T2/3wRphuDh+//eo9q/4vuJ7zUDs6B+ERHZdWPr/yjkQ2pmklQ4SdFdpG IVcQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=00ApNJDqXKjFwJkfLHkvhxSDhZpUrC0YZKtLuQZFpZY=; b=FXEMS5XFvWwvV5GD9pJJHg8Z5X8TBGLpJXcUv/30+v+Bg/1oMLE0wzeXrFzx5nmgdj cP0LW73wp763RYStK4HJzsvsk5/AhZQxqhD7z+104hQ32ssO9cWZjfOK2rP9KCAkmLpl K8mHWSDR/k1ncHW+UptX/slq+aGQ1z9gt5zSKJL8YELrD6b14FjlgheWigRBv6pXzKZj qUSz9rGThpgfTpc7FT1kyzDO5BuJebvFkwOHEYsKDxO7dni5FXbeJlMr+xd0068lOkVt VY6RRcAZNa6evIoSmXG6pZazBRzGeqKEBWG/qR3Kw9IWYgTNEtO4PHwUuHkbIrSbHjcf ZhIg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=mPMZQRT0; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe07::61e as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02on061e.outbound.protection.outlook.com. [2a01:111:f400:fe07::61e]) by gmr-mx.google.com with ESMTPS id 12-20020a056000154c00b00203dc4af53bsi1322823wry.5.2022.03.22.09.46.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Mar 2022 09:46:26 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe07::61e as permitted sender) client-ip=2a01:111:f400:fe07::61e; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=mPMZQRT0; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe07::61e as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CxBU90vj9WUdmgs9jTwnXHdv6soJ0OG4eo3MxThQ5Db1MRzfEIC4mLkC3AWER9LakwuA4k5myFEGNQ4iP6gOnqtvkcz9BVaH4WhTBShi75QD6t6F62YSHlQHeJSenozp/SfcGOYu3zClj8luEcD+Rsq1/7QHT5FzvAgZv0sRIlaqU/HeF2nzizS348Hrrs4gDb5fBUB2nujv9ee3ew+UhqbeoOVUDi75tEE3XSYxXfT10uc6f0Lgsv4gTk5B81E2chfZ2phgqxExxtGjh+irzlRaaRcFh9zRn6d6HWZM2w5k1bcjM8cJB/ClEl/v+RaRqAmwmT4aEOZBV2rBX8wTOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=00ApNJDqXKjFwJkfLHkvhxSDhZpUrC0YZKtLuQZFpZY=; b=kUpL/0pludAUN/snilkUWiUq1EV6dt1WpY6ZyRrkQpvwAZVW70WgNcLQzUdh1dixoH3ZmrXTEPTgsKEag4/BcVTyo1eMwLwL1fUqi1OMUHqDNafbwwDTavGFYJYgX3zgOkAddXn/o6G6IV0grxtGch32ebvmd2W5dS4RglSsz0ZKIGic8uOFWcZZuZWaFdNbnYOvFduzmMpMupZtPYqUXfTmRzeYQ4sWc0nXkCCNswG1kUKyf5TMdI1WAdqb214YnkAYv3b42XrtBqQwas4VkJldDFRUiGbsHREh2/2fn3VWUQZsUv5niHJGPfPmB798dU2mxxBMBKEKAmlyKH5PlA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.71) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=00ApNJDqXKjFwJkfLHkvhxSDhZpUrC0YZKtLuQZFpZY=; b=mPMZQRT0AaO5mf34LIxgW7g6Ys6wocjLnSzzPjFJ/BT8GNWWtlulDLIZBdfK0w3N1+WuHuPJS7uAd9a+w61ArMLD1Q5VdDOFZSPltqpui34YWJbWCjKfnvAIZYlVb/ibSI5Y7NfPmueqbvzV6lN9Joz6T1RUW3cys2ChVThH6QVWZqFdI1uL6U+NodpZ/6rqu2kNGZCQSveaN2NGyXtIl+gwf/WA37/yKeWH3vg24YjxsrlKoJi7Itg5iOpiqkXiwQEm6aCNvKplYAIk/TqBG4i3mjR7BUFF7N+u7w525tOKSsdqOq2rGxeYLGTuLEqa/qZpUzz5quWHdxSqODmG/A== Received: from DB6PR0402CA0006.eurprd04.prod.outlook.com (2603:10a6:4:91::16) by AM0PR10MB1972.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:43::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.19; Tue, 22 Mar 2022 16:46:25 +0000 Received: from DB5EUR01FT057.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:91:cafe::84) by DB6PR0402CA0006.outlook.office365.com (2603:10a6:4:91::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.22 via Frontend Transport; Tue, 22 Mar 2022 16:46:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.71) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.71 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.71; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.71) by DB5EUR01FT057.mail.protection.outlook.com (10.152.5.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5081.15 via Frontend Transport; Tue, 22 Mar 2022 16:46:25 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SKA.ad011.siemens.net (194.138.21.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 22 Mar 2022 17:46:25 +0100 Received: from felix-dev.test (139.21.146.185) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Tue, 22 Mar 2022 17:46:24 +0100 From: Felix Moessbauer To: CC: , , , , Felix Moessbauer Subject: [PATCH v3 6/7] Add pcbios option to start_vm Date: Tue, 22 Mar 2022 17:45:24 +0100 Message-ID: <20220322164525.3950970-7-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220322164525.3950970-1-felix.moessbauer@siemens.com> References: <20220322164525.3950970-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: felix.moessbauer@siemens.com X-Originating-IP: [139.21.146.185] X-ClientProxiedBy: DEMCHDC89YA.ad011.siemens.net (139.25.226.104) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--7.773400-8.000000 X-TMASE-MatchedRID: 435hyu3TqhV4FTWzKCjc1RlMp4O5kTedRSatKUKFoLESEYfcJF0pRWJ4 2+eEOm5wTPm/MsQarwPYm/1wAQO/Cq3aC25avUualEFre7kn4QwpihxiHusRw2WnA2xO92UpQon mLI1gY+ndts4JC28aJDSghb/pcAwyDBtpxTERGLKbvdUVlY5ZkCnUvNYmdP4wfgFnYw42PF3qob kz1A0A7bt692a3f3TdBnY1HootTEzaQBv+au/jC4Ay6p60ZV62fJ5/bZ6npdg7AFczfjr/7F0NQ lriQQ9uHl7Dn7C0mDll2Z4jM2u19foCk0wXt6jnqyLe/aDIdRk= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--7.773400-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: BD7B2861EEA050802C40A45FA1DC9AC07BF26A22D37480C1216C26F0CC5D4EA62000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2aacfd62-650d-4f5a-beae-08da0c238145 X-MS-TrafficTypeDiagnostic: AM0PR10MB1972:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yk6ryhP7hvdZ+8s/tf5+ut6fAxu3T++nAYRNExT/Rx6LC4XHzbSQWKZtEwPM/71mA/IxC7W0gESz//zBEKsuzTbD+CJvr1hRDjCosHuHaJrqlO/Ea9g+c+c4SbyYL9x8Ijytg/EOiRDYRapgN53P6uI4Qgl677AtKp7JpbmwBQq+p+nedst6hdE54so8T24ClFXpdv9HM2WJ//JG82CUIxrFfpRSTLWsqvVX901AR8nB+CBYKqrbInjdiCOydkfVciBRzFAXw/nDlIjMDPuOwWQ2icS+aWfny+Dg+fXT+2ni/8fuINBdzEDgZiw0daFStixsBGomGyBDdRZgJ79rY21cCqkhUHE6r8FDwZfmshCJYsAT18Jund1W2QaHN3592x01jq9FFlMEcFVSo/RgD6vx3+miZW2QhPgik0yHCoIOzOIP9BsGKq8VEj5unqPlo8F7cZZdO1iUp/vVZ7YN73ZlDwUwTn7gL3IZdqEXiSseo8cqINhS0oAfmZrc6Mv4a7WgPpGIKpp4ZhnVWyW8+TRt69gZGvBwHE/YKnEJM+aLMRO2AuHFD/UN7lfqPo9dmoA+VDjVslVqsb8exiKWfYz7vRdyjnbEYqU+t3sC/cHRZJHeSJGPY5watJ9b++VYHwj7zwvgHFPokFpQPLwTq+5vO41zu22JFF3KyCUeaVKSorh2UHOCAMFiiv6qcvfkh+ILYV8+86tpdHusmA32sw== X-Forefront-Antispam-Report: CIP:194.138.21.71;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(40460700003)(1076003)(83380400001)(36756003)(186003)(47076005)(70586007)(16526019)(26005)(316002)(336012)(4326008)(956004)(2616005)(8676002)(36860700001)(8936002)(54906003)(81166007)(5660300002)(70206006)(44832011)(6916009)(508600001)(2906002)(356005)(107886003)(86362001)(82960400001)(82310400004)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 16:46:25.7803 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2aacfd62-650d-4f5a-beae-08da0c238145 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.71];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT057.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB1972 X-TUID: hFWF7fJc0ezs This patch adds the --pcbios option to the start_vm script to enforce that any -bios QEMU options are removed. By that, QEMU is forced to use a pc bios (like seabios). This helps to test combined efi + pcbios disks as these can be bootet with both efi and pc bios. Signed-off-by: Felix Moessbauer --- testsuite/start_vm.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index 8fd3e16c..708520f7 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -21,7 +21,7 @@ def get_bitbake_var(output, var): ret = line.split('"')[1] return ret -def format_qemu_cmdline(arch, build, distro, out, pid): +def format_qemu_cmdline(arch, build, distro, out, pid, enforce_pcbios=False): bb_output = get_bitbake_env(arch, distro).decode() rootfs_image = '' @@ -66,6 +66,9 @@ def format_qemu_cmdline(arch, build, distro, out, pid): extra_args.extend(['-pidfile', pid]) qemu_disk_args = qemu_disk_args.replace('##ROOTFS_IMAGE##', deploy_dir_image + '/' + rootfs_image).split() + if enforce_pcbios and '-bios' in qemu_disk_args: + bios_idx = qemu_disk_args.index('-bios') + del qemu_disk_args[bios_idx : bios_idx+2] cmd = ['qemu-system-' + qemu_arch, '-m', '1024M'] @@ -80,8 +83,8 @@ def format_qemu_cmdline(arch, build, distro, out, pid): return cmd -def start_qemu(arch, build, distro, out, pid): - cmdline = format_qemu_cmdline(arch, build, distro, out, pid) +def start_qemu(arch, build, distro, out, pid, enforce_pcbios): + cmdline = format_qemu_cmdline(arch, build, distro, out, pid, enforce_pcbios) cmdline.insert(1, '-nographic') print(cmdline) @@ -94,6 +97,7 @@ if __name__ == "__main__": parser.add_argument('-d', '--distro', choices=['jessie', 'stretch', 'buster', 'bullseye', 'bookworm'], help='set isar Debian distribution.', default='stretch') parser.add_argument('-o', '--out', help='Route QEMU console output to specified file.') parser.add_argument('-p', '--pid', help='Store QEMU pid to specified file.') + parser.add_argument('--pcbios', action="store_true", help='remove any bios options to enforce use of pc bios') args = parser.parse_args() - start_qemu(args.arch, args.build, args.distro, args.out, args.pid) + start_qemu(args.arch, args.build, args.distro, args.out, args.pid, args.pcbios) -- 2.30.2