From patchwork Wed Mar 17 04:52:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 364 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp645647oor; Wed, 17 Mar 2021 07:53:01 -0700 (PDT) X-Received: by 2002:a2e:a318:: with SMTP id l24mr2648941lje.399.1615992781050; Wed, 17 Mar 2021 07:53:01 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1615992781; cv=pass; d=google.com; s=arc-20160816; b=WtKEsgyNiJqUUojrukvmNJxq8/Aqy/HvtLdBE4VAsRN2xPW48YZqyhn1CKeJ3AxP2G IlH/GUE2n0/gxBhMrkfsiLWrEZfl/J9/WweCoisj9GC1WZW23ZrXqY26OADPcL+A6iz1 yLqAF9H7CaO1cVFfXgyXh4kK6Q0eLBkc/QCuwqro4QBS7ylsM10tcfnPuPGAyvMz5EQq B23QmaTyrwckcI40AB7VkcC0QoDVo9p6uyncQM20dUOjh3OFA/EhbiaTvu7HpcxnWPXj YIjJS3WtmsFARAHcSaFtCDE2bFewiuqhBdEfuBAaIxv3qzWnFuNaHZFQ7KWo1Xg9iFjV Q/Hw== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=Li0rVnZlGij2ioW7E8DnmpYWxSXAHLmOwzT5/dWpM7g=; b=m2l1JZyiq+VXlCOhvjyCkUdFO/cvlczPiYAH4u6etMe40ULxN4bmuF13kYO2nwCcPP SBncimK6YQqgzUR4ALCuw5yI1dCjrUfuEHNGBvu0aNsS+dfmKwSG7RpWAAjYp7uxJIPm 2GCB/iz8oh5cRvXmycpgUEuebltWbPe3byQAhTOaPXm/HSogNnBdGYmhm25eg6o+RuD2 qiDPridRGpGCx0Z6+0AN6ZOymVWW4sfnsTp5ileX5Qe/RmvWnsOlgwlvbWMk/AMf3Vuk yT9uMNqbpoKkaAKN+SnKvsDIuFfIIZQVZsCGErIsTTnvw0kgpduKWHvm2Cn55QK/rlc+ 4oQw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=dEIDGGYH; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbtfpzcbamgqet4afqja@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBTFPZCBAMGQET4AFQJA@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id x24sor9560675ljj.17.2021.03.17.07.53.00 (Google Transport Security); Wed, 17 Mar 2021 07:53:01 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrbtfpzcbamgqet4afqja@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=dEIDGGYH; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbtfpzcbamgqet4afqja@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBTFPZCBAMGQET4AFQJA@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1615992780; cv=pass; d=google.com; s=arc-20160816; b=YMlBSQ/FeHHXfuiMCq2OpH+arTo9ns4YimrLd8VmNahc0qEu9G6Ow7Najm8nJn2rab A5Pro0fQKRVcd5aJY7t9tJml3evzi+Cts+2FT4oNCpHcJBtA1P3BuocfSL2Sm7FeY4c0 qBEqiCp6z/ywdL7yRrVGAj7OSL7VxDlCrIEHKk5Gscv9Nmio1eUto2gyixLYuDNuxiHS rkLNap5ZFjSTfKS56gE251e9JdcaOYM8Duf9qZCAKovFLDA7qWgsdWk80N+bPV9c0DPV 0E3w6g/C7bpdqlC/VqN5H2vFTr8ZCszMN5OflVXLDUxK397JbfPKRpmNcpUUUWQ12VYk 0N/A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=Li0rVnZlGij2ioW7E8DnmpYWxSXAHLmOwzT5/dWpM7g=; b=mXSlKdUhL/yK64Fp6lFmPS0d1KexYC2HZ7wNfch7QjjxW1U3zA7Ip6QZihWrCD/Lry ewpbStqS92LW3PXhbeX7IKVCK5zrgWJh0FjChgwApLGRTcif7vgz6VyyWRcjcjM8NXWM v5bfgRReAC54FhXeJ2ltkujrNj4YNV50DOG5eZ1X1jNpeepSzsaqH8Co2dAhmVPBLfr1 aaZu540OBSumFfhlJWIt4An9wUk8lOojSKRcy9aMPC6dbrjDfAHNogfemM9Rv86sVh0/ TAKHpVNwJjjpGJudQIEP/ThFF8GMraKUsDdRFx5PNyEC+fKnfWR2g+qexy1rrACYPkOz bxog== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Li0rVnZlGij2ioW7E8DnmpYWxSXAHLmOwzT5/dWpM7g=; b=dEIDGGYHul1QpPORQGXcK+tCJ3DHXqXBdV9olmNDGEmKr4v3tqf8czqFdWhVfTPBxL 4snhk82hF7xzKA9vqGypKWohq3cFTtdI0F+wB6wYvfreZjHxnDGEMxxv/5DzPBFYX5md VyTnsI0SWVeDRAaI/JURZpLYHV3LcNe9DKUFBAm/1KTyzK+JKkfLvY5YRPtea84D7fG+ sNEmGVzLGGuyQqaful1PzfM3C+6h8kTmN9uvQ4uv79WGqYhu3sfb0VP+T1ytF1xtWRIq jVr030vB/kmXrzAJuYFMWdya4NDQJ5aGffNWYrRMIip/014usEN3nQ+NPncKwM5yjdvr pLqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Li0rVnZlGij2ioW7E8DnmpYWxSXAHLmOwzT5/dWpM7g=; b=WJ2PSncNMeOMx1broHedwMDY5Ps01nn3uFyZavYsfHEPxJYa49RpzKUYa+Kc6wl7sf HFpialZz3apqUb/6L3fqj6MBNrel9zEzqe5SZ2usyH/mA/pa8C/LMvAg3PmaEe1OOyzg vJPNtl3s5G9hdwnfqhdIUWxAAQPdvbmvsvjIYztS6g3xNsvmpCLi4Rkcmng7gYFkgMcG FQW0Yj2UtLEPhBObRAa94V/Y0+YgEMSawU83x7Pm3pUDKOEOJ+by50otB4iYp5yheA5m 4MQ9lLMa/0KyHRQqF7P/sDfWUz67UJYzcJacePFLIL47gMofPYP8Sv5zPAOGJ7paG/Cm DANw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531jN8vbpI8ML87rIZbBIh5c3uhi0kbCwvvM8U0nzLGhWbyn+1QQ 9o3nLASwaQpaIpUGU0KzdsE= X-Google-Smtp-Source: ABdhPJw6ialNJoI+aDzNY11E/xwgKw4uSiXzyCrXa0Pz757v5RBY23rp5oeJjQQeIDLVQ/6H06a1Sg== X-Received: by 2002:a2e:9a98:: with SMTP id p24mr2686846lji.86.1615992780711; Wed, 17 Mar 2021 07:53:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:ace:: with SMTP id n14ls4779604lfu.2.gmail; Wed, 17 Mar 2021 07:52:59 -0700 (PDT) X-Received: by 2002:a05:6512:370f:: with SMTP id z15mr2607696lfr.562.1615992779815; Wed, 17 Mar 2021 07:52:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615992779; cv=none; d=google.com; s=arc-20160816; b=FdRrwgmwIZzEszqmCOQ8h4BkJHF/VTlMOVajfgrxHdJ6t9WlhVR3zoPhbFbwFcahfp UPUvrPW/AYXAq6Y/OubeZGS/atZY8pncAF3gfxuL19axU/r9mbmoADtr7lYypRr913qF nTH4xAagA/Oxvx46UR3Q3cFX97Zpv6QYal7vNdtoi9Zg/LpVkkZ0ElrRKsU33NyIWZ2I y6qULesqJUC1M9Q64bU3JZzI+TWa78prstOxkdSlNJr/Rphpqobtw3X6RE7v516ebXJr adS+/ok4OEEAz32328JEHHwmoC0JLOt5ioaW9gVf8GOKvFAa7rVAMHpipov7lr652XZA uZIw== 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=jh/Dm8QsiR2TU1/f/Eq9Tak4PBh4yRtzBSQv1oGDqC0=; b=h9wVnmLCgOwQMa3IpnW+2KHyq1Cmc9aOEtnKSlE9DP4VNUMjFP3brjOj0SgbbJjl1B DkpooP37ZSApLKAMqI3QeBlLqa/8oEgdYML0vdfpyuVywE/lFWvyjbkzVAUlTkbPP0Rl nfg0tK7ihwIyv0vzVhu37qdiQyiGjxaz3I1CIa6oOQ24XanHRzxdyqB9Z6YiGK260lTh VVx5xAZynReXq19fHAn3UZF7KUphxkzA2EzAhJcZb6Li4A1vbVCdEqF8QDPhaboi9x5H MF8epv4UkfiE7/GhmAxXXdeH3k4kWOl7Ke3nVh2hPtAci0cAKT6lTkAk7T1EnlS6fHBA 6BnQ== 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id o10si991164lfg.12.2021.03.17.07.52.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 07:52:59 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-117-75-121-178.mgts.dynamic.pppoe.byfly.by [178.121.75.117] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 12HEqhaB032071 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 15:52:58 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Roman Pletnev , Anton Mikanovich Subject: [PATCH v3 02/11] start_vm.py: Add output and PID file vm_start.py options Date: Wed, 17 Mar 2021 17:52:16 +0300 Message-Id: <20210317145225.88050-3-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317145225.88050-1-amikan@ilbers.de> References: <20210317145225.88050-1-amikan@ilbers.de> MIME-Version: 1.0 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-Original-Sender: amikan@ilbers.de X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1694491246499036680?= X-GMAIL-MSGID: =?utf-8?q?1694491246499036680?= From: Roman Pletnev This patch adds options -o (output file) and -p (pid file). Signed-off-by: Roman Pletnev Signed-off-by: Anton Mikanovich --- testsuite/start_vm.py | 16 ++++++++++++---- testsuite/vm_boot_test/vm_boot_test.py | 3 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index c10db67..0abb9d5 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): +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,10 +77,11 @@ 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__": @@ -83,6 +89,8 @@ if __name__ == "__main__": parser.add_argument('-a', '--arch', choices=['arm', 'arm64', 'amd64', 'i386'], 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)