From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7008446828784910336 X-Received: by 2002:a05:6512:3341:: with SMTP id y1mr240516lfd.496.1633020353153; Thu, 30 Sep 2021 09:45:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a304:: with SMTP id l4ls1411519lje.7.gmail; Thu, 30 Sep 2021 09:45:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCTJwYDUAxhCuqN5MzbkLoGXyCP5+2m8e5HB3SKtzXak8klsmfOjAH6Ar4xgQWxZHw1scT X-Received: by 2002:a2e:1443:: with SMTP id 3mr7252038lju.410.1633020352058; Thu, 30 Sep 2021 09:45:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633020352; cv=none; d=google.com; s=arc-20160816; b=n9PIbnRoOMbyNErSPfqTnkHHBTMNLmNtN/LJS6J9d4klJgAIVa3dxnjqMZawZZ8B4d NABc9QvtyLWb4Kt7RmVQmk8fTVfc30lmkeQvNKtRMioATvtrmuynmymNZGT4YGveWtsO 2H5fr9Q+Yxcnha1ay+aKVEIoX31+rVRCU+cMJeuivzIJjtFwAmge+hvJsq9BNvfsdM1H kAu3cacYPt5LrjuKeQN1BIBPdUOkHXrgCtVxKxVOUlklvJKuGMwAt9oEDLe5qx+mv5lr 7wN2SKxr8azCRwZQmovtFJrUa/IUCYB40l5XcCRUVIkWiIhBjXeOR43087FVLxI8woK8 kXCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=PFFCncg8GinZuaWF7iEZJbORNgmgCSO+EACNeTebPJw=; b=BHq+d283dG6s8LL6GdFjFy3zCLW/h4oS8tn9db/r+20g6EGRne3LkBWBhV5VO97PGX hJARRtV1bOr9x6pmavoR8Asem4OKl4smaSzEkyYEsQpiiqWBv2C3G/58D+h2HVvDDHbr Bt6u75/dTDgO+TkZO9EnUTuHGhLbMbZw2buqZZpwNc+OUr1yUBuqBLxn5XLFieH+qALR T0CeE7ysXVsyY28LRfuK/kQJw83OHPwTzUlqb+YpqsOpbEpI/Q1GIcEonwlwHO9OGrLm CDXGBaPdnezqiU+9pNcqavleKPLHYEOtY80RW2h301ptpMuQPLK3lC9x+b+9LX7n1CmG 4/xA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=softfail (google.com: domain of transitioning anton.mikanovich@promwad.com does not designate 85.214.156.166 as permitted sender) smtp.mailfrom=anton.mikanovich@promwad.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=promwad.com Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 24si212437lfz.2.2021.09.30.09.45.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Sep 2021 09:45:51 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning anton.mikanovich@promwad.com does not designate 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=softfail (google.com: domain of transitioning anton.mikanovich@promwad.com does not designate 85.214.156.166 as permitted sender) smtp.mailfrom=anton.mikanovich@promwad.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=promwad.com Received: from ws-323.promwad.corp (leased-line-st-87-252-252-30.telecom.by [87.252.252.30]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 18UGjhua018892 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=NOT); Thu, 30 Sep 2021 18:45:48 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Roman Pletnev , Anton Mikanovich Subject: [PATCH v14 02/16] start_vm.py: Add output and PID file vm_start.py options Date: Thu, 30 Sep 2021 19:45:27 +0300 Message-Id: <1633020341-26062-3-git-send-email-anton.mikanovich@promwad.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1633020341-26062-1-git-send-email-anton.mikanovich@promwad.com> References: <1633020341-26062-1-git-send-email-anton.mikanovich@promwad.com> X-TUID: wyGGay4Dq8Oy 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.7.4