From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6928418269464363008 X-Received: by 2002:a05:651c:1284:: with SMTP id 4mr9175382ljc.279.1613381225817; Mon, 15 Feb 2021 01:27:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9696:: with SMTP id q22ls1953639lji.9.gmail; Mon, 15 Feb 2021 01:27:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJykZcctDyKVJQgaaC9WCychA3au83KVHLDLTE8ls/Ulu/pHqyf+O1WSLfj425uS8ujAbF+8 X-Received: by 2002:a2e:a550:: with SMTP id e16mr9364425ljn.197.1613381224778; Mon, 15 Feb 2021 01:27:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613381224; cv=none; d=google.com; s=arc-20160816; b=ymBQh929ewcLsqd2tImxHwgjNujsJKhMFdUcbl+ApO4s3RPE2bz9101/xi6p3FkYRC QhvrJIFrzj+I0iVk5uioBYxoOGPXw8ZUDvB5QaCNmpX69r815XI0sAWuYBox2wDvjgoE Vu8tCozjjs9sGGlzkdu7t8Qw6HOHfm+/v9jzlYD132Ni2mKtscaSo/NVL8e4vQAdETzI sLC1U0VUDwCjR7mzC89tfajF8YgdNZrUyic9JG29hm1KjF5t+CbEmYpWF1KZOEE3t9GS C4FrMIgoOlRsoOWMN6R/XhJKOSn84vr07aNI5g8tLK0AcVxVVpKD66p+rFkl4XYZjqcx 8TRQ== ARC-Message-Signature: i=1; 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; bh=VQVB1Do3Vec5nbSMJ6e3evuAMenWkdpjVTgj52QQ7Kw=; b=SugV+unmeZxZP6ufiKxu3aTmg54HWUieMH+53XRFF8ZkGQTzl0y+7NSH7u4Uly+0C+ fqsmbGqujURH/gYPHhO9yhVykC6omNktdr9Lwk+mrwIQgwQpejdM/mXEovGE2EN4DrxZ Jyu8o3kAAd20IspYTQN2ErAvgp+oEaWnQluyntsWHeLSX/Z2WSEBTsTGz7lDg83Ud+pl LG7vVk3HzOpu5+aShNBzEX6K/8Bqozqsdb8Ca0U6vGqgPQWbDtsc44hi+/wnSY12C0TH CuG78gYyfYztNFdCNU6PhVHD2dGtig3t9luphFRhvdZ9uhPTIuzBKvWY5nMEiyQIxCWi 4zTw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id j2si634781lfe.5.2021.02.15.01.27.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Feb 2021 01:27:04 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-131-52-214-37.mgts.dynamic.pppoe.byfly.by [37.214.52.131] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 11F9QnrB003503 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 15 Feb 2021 10:27:03 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Roman Pletnev , Anton Mikanovich Subject: [PATCH v2 2/5] start_vm.py: Fix target name handling Date: Mon, 15 Feb 2021 12:26:32 +0300 Message-Id: <20210215092635.24511-3-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210215092635.24511-1-amikan@ilbers.de> References: <20210212164115.89196-1-amikan@ilbers.de> <20210215092635.24511-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: muo8JGPIVIsb From: Roman Pletnev This patch fix bb_output search (issue with wrong arch name being selected for qemu). It also add mipsel to the list of supported architectures, add options -o (output file) and -p (pid file). Signed-off-by: Roman Pletnev Signed-off-by: Anton Mikanovich --- testsuite/start_vm.py | 20 ++++++++++++++------ testsuite/vm_boot_test/vm_boot_test.py | 3 ++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index a3e32ac..dce140e 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -17,11 +17,11 @@ def get_bitbake_env(arch, distro): def get_bitbake_var(output, var): ret = '' for line in output.splitlines(): - if line.startswith(var): + if line.startswith(var + '='): ret = line.split('"')[1] return ret -def format_qemu_cmdline(arch, build, distro): +def format_qemu_cmdline(arch, build, distro, out, pid): bb_output = get_bitbake_env(arch, distro).decode() rootfs_image = '' @@ -57,6 +57,11 @@ def format_qemu_cmdline(arch, build, distro): qemu_cpu = get_bitbake_var(bb_output, 'QEMU_CPU') qemu_disk_args = get_bitbake_var(bb_output, 'QEMU_DISK_ARGS') + if out: + extra_args.extend(['-serial', out]) + if pid: + extra_args.extend(['-pidfile', pid]) + qemu_disk_args = qemu_disk_args.replace('##ROOTFS_IMAGE##', deploy_dir_image + '/' + rootfs_image).split() cmd = ['qemu-system-' + qemu_arch, '-m', '1024M'] @@ -72,17 +77,20 @@ def format_qemu_cmdline(arch, build, distro): return cmd -def start_qemu(arch, build, distro): - cmdline = format_qemu_cmdline(arch, build, distro) +def start_qemu(arch, build, distro, out, pid): + cmdline = format_qemu_cmdline(arch, build, distro, out, pid) cmdline.insert(1, '-nographic') + print(cmdline) p1 = subprocess.call(cmdline) if __name__ == "__main__": parser = argparse.ArgumentParser() - parser.add_argument('-a', '--arch', choices=['arm', 'arm64', 'amd64', 'i386'], help='set isar machine architecture.', default='arm') + parser.add_argument('-a', '--arch', choices=['arm', 'arm64', 'amd64', 'i386', 'mipsel'], help='set isar machine architecture.', default='arm') parser.add_argument('-b', '--build', help='set path to build directory.', default=os.getcwd()) parser.add_argument('-d', '--distro', choices=['jessie', 'stretch'], 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.') args = parser.parse_args() - start_qemu(args.arch, args.build, args.distro) + start_qemu(args.arch, args.build, args.distro, args.out, args.pid) diff --git a/testsuite/vm_boot_test/vm_boot_test.py b/testsuite/vm_boot_test/vm_boot_test.py index d4849c7..f1b7b1f 100644 --- a/testsuite/vm_boot_test/vm_boot_test.py +++ b/testsuite/vm_boot_test/vm_boot_test.py @@ -30,7 +30,8 @@ class VmBootTest(Test): if os.path.exists(output_file): os.remove(output_file) - cmdline = start_vm.format_qemu_cmdline(arch, build_dir, distro) + cmdline = start_vm.format_qemu_cmdline(arch, build_dir, distro, + None, None) cmdline.insert(1, '-nographic') cmdline.append('-serial') cmdline.append('file:' + output_file) -- 2.25.1