From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7071266692367646720 X-Received: by 2002:a05:6512:3ba6:b0:448:23de:ca79 with SMTP id g38-20020a0565123ba600b0044823deca79mr6197961lfv.400.1646635438192; Sun, 06 Mar 2022 22:43:58 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:150b:b0:246:4c62:294b with SMTP id e11-20020a05651c150b00b002464c62294bls1942034ljf.4.gmail; Sun, 06 Mar 2022 22:43:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxGVjo5L/wVvjKfpumIrFt2Fg23uHSAlsW1Czh/00vcKaQGD7i7lxqWkrksQ5r2Y+xOIUxy X-Received: by 2002:a2e:9147:0:b0:246:1379:2cd4 with SMTP id q7-20020a2e9147000000b0024613792cd4mr6731118ljg.418.1646635437231; Sun, 06 Mar 2022 22:43:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1646635437; cv=pass; d=google.com; s=arc-20160816; b=zDPAMXGdX+vmMTeZ+BIN1JyS07iy2nwsTJsAAt4a+eedhSbfWjaNQFaMEPoOYuSLwq 9K8jJvXZR523/L7nbf2B4dx8mOvU/L+c69+OXsamiHZQCUWgmKZw6HGkRN7bX4veXK0x iO21Fi/K73ED0dC03uub5ypRL6ON2RB68kxW86S2uHUQF8pBecfnawa5j5RqkKmwbshN 4il0rrBPUsz715wCewKhdZwjQaEWbeObqNzPyN4cQt0RAwHES3cBbPKavFb9Ssml9IxA PxaXvTHFk9NnlMGo1bGlR1mZPG+7GCikFZ0R4+C1B4N0kVJnFUAcbHn8PpqPy9WIEEcv BbmA== 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=oG2/dAhsUduX2ljz8hJQ3T8aUSLATu68Sk8/UijjK+nOvqUUtFsC79y8ii2ZamIthl cBAHyfgDS7denuivi6gOluLRNryEzrly0rC7eQwaUHIL4/1zuBC5rXNNOqzLU4O/0JVq aMb1i2dU6JpRmpBIw6/8THxx8GKOPHNRhGQ+GTd+5Cwk8c70Mx7blmKq3K97qh0mN92i XXDXC4PYU56wyOsiK2G9y1J+RSHKp7iksOb4tFPYyQbyc599WW/PKr7m087DRowph7hU XTjcMwBxp7jm6CJ5UYbaJoOQ4xDW5+3zSAwlIRvzzRkgi9SZzJqk7DLtocQNXIhxmwv0 vwAw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=t4+ohzby; 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:fe0e::610 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 EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0610.outbound.protection.outlook.com. [2a01:111:f400:fe0e::610]) by gmr-mx.google.com with ESMTPS id b19-20020a05651c099300b00247e331d3c1si133632ljq.5.2022.03.06.22.43.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Mar 2022 22:43:57 -0800 (PST) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe0e::610 as permitted sender) client-ip=2a01:111:f400:fe0e::610; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=t4+ohzby; 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:fe0e::610 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=g556K3/p8IrhuWsfVnQtHtW5mlpHTg/N2u+dZh3fXV8Kum3UWL7WqrZ2OT562pdGqDOnVsnmgGuJRN92Skyc0mKzOR6RfP1qffYzrbKwFh5QYjwzyCZBC14CUFUAkZnL/chnsXZkUVLPqIYEZWJPdt4T1hm1dr41hCn7/6pTaRNi12lKu6Qy84NA1Lie3fPWzGRwWRCGDTkDJGQ71WXpcnKGAh2ocNtlrOO560JgZP+t+B8+Skd1MIRxrZQY+5T5/pJKu8xrCXtpvMpowvYm2GyXZBy0ClDSu+26iQYac+/CZzU4R2U3VA8OqZY25teR7QskTZyk7acN/M0kQuOT1w== 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=fY/Rg9zo2rjMw+Ur8V+ltCplitI17Jzk7G/iyqhbrbOcuNqpI/MdT/qxmzrgkyskmO0FmyrL7WFXl6U5xd9poQuRTbG34Gz8oNhLSfdagXugsGWB7Qthb+FnMXcMLA1PqCIkOYIq4FXLvFCknXJV10hl7Dr/CCFHL3aWc33PGyQqWEtkGxhmUlzc/Y3G3JZGPQEdA2NzIhEHnX87hpvGumTTx1UGVmEXYtvDdiBQHLGBvB7Vzis+TBwDZz2a4m7Xk3jYGlBXT6i6yGoMTlv1nzDJ/r+D0TzN6KV2JfDLVH7T9YNZljnnzCAA9l6RxkFsTSqIlGxzKieQy8qVMyVqkg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) 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=t4+ohzby280JviE0nzgPg56CaY1Pt8vDCUhi1SFZcIZRIPtjzTF/EvY1DEYMdr1LJbThLc5tj/XlykWrrqKgg3b53FG5GUkqP8R1NAn02H3wV1OjIF/drrw2RdugA/P9kcQwQPdXlUaG1EA2orfs2gWQ/Sf50rXFyPuP74ZalTQn03ASGUNufQaODK9zOjij97Km9rcqmh7730RBwlOQryOcfoSlqI1NlNDqDUzHDHL+OlKKeaeT9PLBIjIN9gdteRb2F9ULG1WwkCxpRXfFquWg6Ht5nySe4n3VcdVwkXNWXFjiTFk6VcIRgtiYIdCde4T+7tnn8U3RyYjhe4ZsxQ== Received: from AM6PR04CA0011.eurprd04.prod.outlook.com (2603:10a6:20b:92::24) by AM4PR1001MB1250.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:200:8d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Mon, 7 Mar 2022 06:43:51 +0000 Received: from VE1EUR01FT014.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:92:cafe::aa) by AM6PR04CA0011.outlook.office365.com (2603:10a6:20b:92::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Mon, 7 Mar 2022 06:43:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.72) 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.72 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.72; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.72) by VE1EUR01FT014.mail.protection.outlook.com (10.152.2.219) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5038.14 via Frontend Transport; Mon, 7 Mar 2022 06:43:51 +0000 Received: from DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) by DEMCHDC9SMA.ad011.siemens.net (194.138.21.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Mon, 7 Mar 2022 07:43:51 +0100 Received: from felix-dev.test (144.145.220.65) by DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Mon, 7 Mar 2022 07:43:49 +0100 From: Felix Moessbauer To: CC: , , , Felix Moessbauer Subject: [PATCH v2 5/6] Add pcbios option to start_vm Date: Mon, 7 Mar 2022 07:42:50 +0100 Message-ID: <20220307064252.651695-6-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220307064252.651695-1-felix.moessbauer@siemens.com> References: <20220307064252.651695-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: [144.145.220.65] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d044be50-a8d1-4f7f-bc4c-08da0005d76e X-MS-TrafficTypeDiagnostic: AM4PR1001MB1250: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: xEbkQoYBSxEG6ZkgBNXE8YbfD8AHkAO8GkQDq/hO7IwS/pyQeaqCiGwVFAk+3EM0dwR1neTC7fmsWRlJvsPRs7+vslJirtKUpr+gW6u7NXn/QyxHW1Vgfb8HbdVLlmqqhSfbxaHIehhkKy9eSrABgTT+7R7Bw+B8FCvmXm+6x334qWtyejlg3/Fl+vP0TdYAJWU/1vj5DHCmuiXk8aMTktgMVtjWlDAuVBJRw7ijgTfNoYZZ7T68sdDvZvGttIraCjDcqiFb6pWMTIuH3Guh6vYNtWSiVImhRRctD6/ZfE7GgDV0AvTeoqRvergyAHcT4hL66NgFC0kLTwYs/SW7BD08XV6hbn9d4N0dXDCTq9Qa4ItIYTnu0ApRwpLD8jGdp2aZIfEO1lYO9LZlfQeS4MrMhXCXiwoZb14BrUWDLDVp/TWO08EE+1vvSXSTib5pMUdhuka5kkwExWD53xhcCZe5RvK06/3zghx7GwbUJQ0ZzrD7EaLDAHUP2cRqajs8Se/lepWyQmFKu/CYjxmwONmalFOgPUoZa53escAZ12ZAe+3HZ2iVXhblXrJHtzhFwvQzgIqMWMGOT++U9S7hHiHnqW02RWhuAsatlTkgI4s7EJq9JUEn0C/X3Ra5UJyuPhAzK+IyPvB0SavN9WkenEDaZEq0oB+IfI7NNMGTeoFIUZNxzuWtQBv1pcmA4zQ8GVrSG8Jf9k2vSPvA/cYMUw== X-Forefront-Antispam-Report: CIP:194.138.21.72;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(36860700001)(86362001)(40460700003)(83380400001)(54906003)(82310400004)(36756003)(2906002)(6916009)(47076005)(6666004)(316002)(82960400001)(8936002)(44832011)(1076003)(508600001)(81166007)(356005)(5660300002)(8676002)(107886003)(4326008)(70586007)(2616005)(70206006)(16526019)(186003)(336012)(956004)(26005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2022 06:43:51.4916 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d044be50-a8d1-4f7f-bc4c-08da0005d76e 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.72];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT014.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR1001MB1250 X-TUID: G8rkt/zbBx30 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