From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7008446828784910336 X-Received: by 2002:a5d:5146:: with SMTP id u6mr17761998wrt.105.1632740536910; Mon, 27 Sep 2021 04:02:16 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c3c8:: with SMTP id t8ls8219154wmj.3.gmail; Mon, 27 Sep 2021 04:02:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFia3MI7Y85A6U2aZk/oVdzEKxGAFKFdm3Pqq7oMrjqL00y/exKQN1b9/OUlfI3LKrdSVV X-Received: by 2002:a05:600c:3548:: with SMTP id i8mr15062894wmq.106.1632740535908; Mon, 27 Sep 2021 04:02:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632740535; cv=none; d=google.com; s=arc-20160816; b=Yl5HKdh/f7sKGkAk266lcASrH6T5olXgOVQUaHIvn/EFYOKVu+whKhJ+ZyLZaOJrGV p5rd292fThXNpF3qo1k0y8qFKQnuUMnCAodvu2N65vnJOPnwCNpaKC++r0FqtzvrxEkY /vFXgRbHnfT4pfJac+b0oy9euWDyD0k5NuqcLRq2MKzU9F33Z9EfglA4WUFgJCqaVqHc 3zRYZT/gG6HG8L+T9m4zGJVSF8hPk9d+lj00Cmt/7HoK4UixDJV6Qa2pFu1q34fwuon5 offuTcFSM5jCZN+sSRTiX1C12u03lIvROFI84y2HoLpMb022VgzAmLelHAIAweRUaW4p MRyA== 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=m6ZfIQT+x3Q31feE5GeSbnOGYLPTAyQGa7cTf/o3ibPzHOtUAO/m3YLIdb25uNR8pU HGdG4tVy7+kzisMBELcQeQGQkXwg2/TjYejvWBKlI8mO8DQj31GEBOszYm6z22PW3Cgn V5o7MlOUjjYFqz1ANR6Vmu8p3O5AWm28jkn0IsLlFZDQ4zE/gSiaajT2UTPFfMH84aN0 GlSZRD9ZYDqXVsk96FpLWKWm4MU68SjR3C7wGRuCZED2hkXzI82p/bT416PikqWsljZf Db0wu+8pvtg++lZ6gyD1pC54pY2+BsZauXzxgwAZRB70iZ8WntkN4vtdM/+KUJM0LDCh SFig== 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 o205si344190wme.0.2021.09.27.04.02.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Sep 2021 04:02:15 -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-59-42-214-37.mgts.dynamic.pppoe.byfly.by [37.214.42.59] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 18RB25dl004256 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Sep 2021 13:02:13 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Roman Pletnev , Anton Mikanovich Subject: [PATCH v13 02/16] start_vm.py: Add output and PID file vm_start.py options Date: Mon, 27 Sep 2021 14:01:42 +0300 Message-Id: <20210927110157.11291-3-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927110157.11291-1-amikan@ilbers.de> References: <20210927110157.11291-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: uGHUXg1aKlry 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