From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7008446828784910336 X-Received: by 2002:ac2:5d45:: with SMTP id w5mr3354007lfd.642.1631781193242; Thu, 16 Sep 2021 01:33:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8652:: with SMTP id i18ls600541ljj.1.gmail; Thu, 16 Sep 2021 01:33:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRXfyGEUfHZHc3jQhaWbXzBNkdAqXeNUCoiKYlkAFlM2yL3P8zQpvG2ZictLjl/eHYuDWc X-Received: by 2002:a2e:7616:: with SMTP id r22mr3793260ljc.387.1631781192185; Thu, 16 Sep 2021 01:33:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631781192; cv=none; d=google.com; s=arc-20160816; b=ARF1N0sjSIluc30H3LYTJrWZ1f/kTrcHGpTspqjNVvxzmVBU4ox95Oah4NH8V20lXH eJwTuYKPZBpnfV5pQg6j09XL7Q1NIz+kl/9uGvSOY9QtFrBnjrgBkER3A+Y3PQ3fTQWR OzSKtW/gc55Vbd/gJlv32BzOeIHZsLQmSFsJ9terD0J1eoAC7gadUVqy2T7DAP9iVkpT Gx3StYcJaSDTymnY0oECaGNr/jpGB1ZBGYQ+H/7Cbi4bs8JvDOrau3Go5iWU7x11Jxrd +u+8dY+3hq3sgiUhV4gqzpzlNe4sPApAiPUZ2hWlOsgudzNJv5EBOaTTnqnZQnvHLtCj j7BQ== 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=uXgTAgX8Q+BTxT0H49so3r8qGNEQdnGYr35rdO4EEEGw6h3y1yEIPMQOl7qPE0WxYU kpnc1HUk6KPtanCzwbfy+eDVlwode4TDidi6+Ss0tIMbLaKH/Jpyt6gqWfF5B2IKH8Iq Ic95Y6DbbOTYS7j4eV+ajdzXTF4Xpc5QbG9kq3DhNyeLN71gWQvD7gkGfb7Fi4m5UW+Z pJTPbCl4sldFFIoMz8xJy4+Opq3+YKMU2iBKLfhO54UAV/Y93gQN2kYAMtyivaSsE7G7 G1zdXPssVPHYQoad83eM9qQ0ne71WUL2FOdmqSYyxw7xeFzrmetVAIdMCS/tI31MEUSi Z0rw== 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 b25si283261ljk.6.2021.09.16.01.33.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Sep 2021 01:33:12 -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 18G8X2xF021529 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Sep 2021 10:33:09 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Roman Pletnev , Anton Mikanovich Subject: [PATCH v11 02/16] start_vm.py: Add output and PID file vm_start.py options Date: Thu, 16 Sep 2021 11:32:39 +0300 Message-Id: <20210916083253.53037-3-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916083253.53037-1-amikan@ilbers.de> References: <20210916083253.53037-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: gB0C8LV6w9LR 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