From patchwork Tue Nov 22 01:11:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 9440377 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CD149600BA for ; Tue, 22 Nov 2016 01:13:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2BDF2878C for ; Tue, 22 Nov 2016 01:13:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C58DA28B7A; Tue, 22 Nov 2016 01:13:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4DAEC2878C for ; Tue, 22 Nov 2016 01:13:27 +0000 (UTC) Received: from localhost ([::1]:52612 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c8zeG-0005TD-9o for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Nov 2016 20:13:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c8zdk-0005So-FL for qemu-devel@nongnu.org; Mon, 21 Nov 2016 20:12:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c8zdg-0004jk-Ii for qemu-devel@nongnu.org; Mon, 21 Nov 2016 20:12:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45906) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c8zdg-0004if-9P for qemu-devel@nongnu.org; Mon, 21 Nov 2016 20:12:48 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6CCE6552CE for ; Tue, 22 Nov 2016 01:12:47 +0000 (UTC) Received: from localhost (ovpn-116-207.phx2.redhat.com [10.3.116.207]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uAM1CjWv028525; Mon, 21 Nov 2016 20:12:46 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org, Markus Armbruster , Marcel Apfelbaum , "Michael S. Tsirkin" Date: Mon, 21 Nov 2016 23:11:59 -0200 Message-Id: <1479777133-23567-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1479777133-23567-1-git-send-email-ehabkost@redhat.com> References: <1479777133-23567-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 22 Nov 2016 01:12:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC 01/15] qemu.py: Make logging optional X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP If a test case doesn't make QEMU generate any output, there's no need to redirect stdout and stderr to a file. On those cases, logging can be disabled so any errors are included on the test case output. Signed-off-by: Eduardo Habkost --- scripts/qemu.py | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/scripts/qemu.py b/scripts/qemu.py index 6d1b623..1468286 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -24,13 +24,17 @@ class QEMUMachine(object): '''A QEMU VM''' def __init__(self, binary, args=[], wrapper=[], name=None, test_dir="/var/tmp", - monitor_address=None, socket_scm_helper=None, debug=False): + monitor_address=None, socket_scm_helper=None, debug=False, + logging=True): if name is None: name = "qemu-%d" % os.getpid() if monitor_address is None: monitor_address = os.path.join(test_dir, name + "-monitor.sock") self._monitor_address = monitor_address - self._qemu_log_path = os.path.join(test_dir, name + ".log") + if logging: + self._qemu_log_path = os.path.join(test_dir, name + ".log") + else: + self._qemu_log_path = None self._popen = None self._binary = binary self._args = list(args) # Force copy args in case we modify them @@ -91,6 +95,8 @@ class QEMUMachine(object): return self._popen.pid def _load_io_log(self): + if self._qemu_log_path is None: + return with open(self._qemu_log_path, "r") as fh: self._iolog = fh.read() @@ -115,17 +121,24 @@ class QEMUMachine(object): def _post_shutdown(self): if not isinstance(self._monitor_address, tuple): self._remove_if_exists(self._monitor_address) - self._remove_if_exists(self._qemu_log_path) + if self._qemu_log_path is not None: + self._remove_if_exists(self._qemu_log_path) def launch(self): '''Launch the VM and establish a QMP connection''' devnull = open('/dev/null', 'rb') - qemulog = open(self._qemu_log_path, 'wb') + if self._qemu_log_path is not None: + qemulog = open(self._qemu_log_path, 'wb') + stdout=qemulog + stderr=subprocess.STDOUT + else: + stdout=None + stderr=None try: self._pre_launch() args = self._wrapper + [self._binary] + self._base_args() + self._args - self._popen = subprocess.Popen(args, stdin=devnull, stdout=qemulog, - stderr=subprocess.STDOUT, shell=False) + self._popen = subprocess.Popen(args, stdin=devnull, stdout=stdout, + stderr=stderr, shell=False) self._post_launch() except: if self._popen: