From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6940636076695355392 X-Received: by 2002:a2e:a58f:: with SMTP id m15mr2573521ljp.400.1615992780782; 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-Google-Smtp-Source: ABdhPJx3EW7S55QWEHXyn0zKyVz9LNexhAFNWXcEQNh/S11Yey1dgA2oXY9z0ABQfun/u3KQ1lv5 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 Return-Path: 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; 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-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 Content-Transfer-Encoding: 8bit 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-TUID: C74simjAqKSO 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) -- 2.25.1