From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7008446828784910336 X-Received: by 2002:a2e:3514:: with SMTP id z20mr10598796ljz.459.1631898056655; Fri, 17 Sep 2021 10:00:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:503:: with SMTP id o3ls1679466ljp.0.gmail; Fri, 17 Sep 2021 10:00:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwg7O8YJwCMEny3oqjS0XCYjjuKxgzePmMkkYKS/Nmate3XvquSOeUde5X9iPz4w3XVZ/f7 X-Received: by 2002:a2e:5705:: with SMTP id l5mr10935039ljb.456.1631898055466; Fri, 17 Sep 2021 10:00:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631898055; cv=none; d=google.com; s=arc-20160816; b=VOAym2HJJBrr7+8qnX7NeVdXB+Em/xT8rsoG48NSbjdVRGRXw9JTgdS8/PtSqf7kl9 1b0QpPYISvEflnJ1hSMd4RFGRLKCeqIcWdBLiZkbMw5BUiKx4kbOh+5bFIIRpmraco9y Vr2kAtl/JLcmCZwEseT/HKcVve2DeKKw08xf5W+r6qbnISibsaN3O+UdDq2/4Ok4m3YK FXwM9GtvuuCXi4kLrDt3V4XKBeMwY+S+TlbbjngkEC1Pbn1b31NX4LocwfDO5+1MWUAj eyZlgaaA2aaE0L/tqYVK/qqKbfl6Fd06bxpZICIhXzaxN0cYwD27+RNcEVbvFqrX4dez +gMg== 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=VxemkR7rM8HooI2566/+J3pa5XuC6sZKN70n8W7AZHs=; b=x38yq+p4/lJd2Xp435mhBpyNBvcli6IajebqZRbixGGMK1ewfIK/pBczdmY6hxyFrc 0/c/P5Fs/HyIyop9spb+bLMRP8LdHoQbHNNKAC1dgnMH0Gg3HFIsU8Cg/skFGEDbE8Kx NxasHKtD0w4oYJwKUtYkB931P68BqgTGmkLVUNfxEbLAbewicpyQoNv/FuICoOzFKbP3 53rIyHeigKa9eMBpVDx0aMCRiaPIlImqdmv26DDWg5DsXTIMxYC1qHUUGYVbJ4Ddopto Wrqb6T+2XPIOJ21dJS+YYZNQqXO7fIwSUBQq9eQFIsedp6wjMFy0wIju+XwPORGFFTBz RxMg== 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 n6si551019lft.8.2021.09.17.10.00.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 10:00:55 -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; 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-240-58-214-37.mgts.dynamic.pppoe.byfly.by [37.214.58.240] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 18HH0iN0028039 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Sep 2021 19:00:52 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Roman Pletnev , Anton Mikanovich Subject: [PATCH v12 02/16] start_vm.py: Add output and PID file vm_start.py options Date: Fri, 17 Sep 2021 20:00:19 +0300 Message-Id: <20210917170033.74797-3-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210917170033.74797-1-amikan@ilbers.de> References: <20210917170033.74797-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: RrNFuVY4rxrO From: Roman Pletnev This patch adds options -o (output file) and -p (pid file). Implement virtual machine log output both to the file and stdout. Signed-off-by: Roman Pletnev Signed-off-by: Anton Mikanovich --- testsuite/start_vm.py | 18 ++++++++++++++---- testsuite/vm_boot_test/vm_boot_test.py | 5 ++--- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index c10db67..3736e51 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,13 @@ 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(['-chardev','stdio,id=ch0,logfile=' + out]) + extra_args.extend(['-serial','chardev:ch0']) + extra_args.extend(['-monitor','none']) + 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 +79,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 +91,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..96e02f7 100644 --- a/testsuite/vm_boot_test/vm_boot_test.py +++ b/testsuite/vm_boot_test/vm_boot_test.py @@ -30,10 +30,9 @@ 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, + output_file, None) cmdline.insert(1, '-nographic') - cmdline.append('-serial') - cmdline.append('file:' + output_file) self.log.info('QEMU boot line: ' + str(cmdline)) -- 2.25.1