From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6928418269464363008 X-Received: by 2002:a0c:80cc:: with SMTP id 70mr11102794qvb.29.1613313100820; Sun, 14 Feb 2021 06:31:40 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:620a:248f:: with SMTP id i15ls7163167qkn.11.gmail; Sun, 14 Feb 2021 06:31:40 -0800 (PST) X-Received: by 2002:a05:620a:208c:: with SMTP id e12mr8896054qka.270.1613313100441; Sun, 14 Feb 2021 06:31:40 -0800 (PST) Received: by 2002:a37:b942:0:b029:271:6c16:8ab7 with SMTP id j63-20020a37b9420000b02902716c168ab7msqkf; Fri, 12 Feb 2021 08:41:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSJokEihBaWl2MHO+hWK3aEXKmbIeNGRryF/sFEGCnQ8rBs93og2Oc6Tfbp2a7mq9iDANP X-Received: by 2002:a2e:b04e:: with SMTP id d14mr2227336ljl.414.1613148082897; Fri, 12 Feb 2021 08:41:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613148082; cv=none; d=google.com; s=arc-20160816; b=oWs70YEBy0A7OZ105y04IH97Jy9KEN9KnROarGS9gBovPHgPurEDjXIh8Bl4YYZWDb MBA4xaDs82sZW91LP7W2duxz+Yli6Mz0ivmEgLYr8RfQtgA7rU9JaQHrqAfWb6nuNYq1 zY+M1s9aTyT9ZDAl99Ox1UMIhuHxO+Dm3Y0+fC6875w399eJg+M1TA0xhFbrccGrtmBl NkZXLf6z/E/aq7/R96xQhIh+XvvnkThZgLsPSD/PVf9k79/JJHClhLUDwzkYkyo+vXK6 Gdb4ovIhlvVWUxehZ01fCj3CuTgJm4eeVWGPAqZn78y2/cwyRQ34YqnXSyKCOmzhon7I crmw== 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:to:from; bh=srlEROLZ7GJA5vLI+KgzeGyuxBU9zpE69OaIJOJEtPs=; b=RURH+3IZGVvx60cXIDReYOBCKStplED8kdDSt72zw4nOX9mxn5aygfqau02kIPnlkc nWAT+mhUqAzOU72HTZ2AtZn/pk0iVjvrtQVo4CwmIKyWctuHTCliu+I0qJgd8MOPJBhE YpKSPfX2GClJMluLnlLJcpdOrXLpn3g9JOAIhmQeo7kqtYu6NM12p65n7Hrnt551eH2Y VaxivCm0lod+U7YwILnTmSosOTHEH4LwApWMbJ2+feTa7rpUB8I1QZEvrmEOKv+5ul2s oiY9Qc3nbDhFlmCDstqdOsaIPGB0NeOJjGDFC+zxqOcBbx/xHrbNLebW+GYGSK2/X1nL /ffg== 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 m17si299566lfg.0.2021.02.12.08.41.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 Feb 2021 08:41:22 -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 11CGfKbN023218 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 12 Feb 2021 17:41:21 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Subject: [PATCH v1 2/6] start_vm.py: Fix target name handling Date: Fri, 12 Feb 2021 19:41:11 +0300 Message-Id: <20210212164115.89196-3-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210212164115.89196-1-amikan@ilbers.de> References: <20210212164115.89196-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: Suei4/TtC/R+ 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 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 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) -- 2.25.1