From patchwork Fri Dec 2 21:18:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 9459213 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 B395860585 for ; Fri, 2 Dec 2016 21:19:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A21D9285AC for ; Fri, 2 Dec 2016 21:19:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96DAE285B0; Fri, 2 Dec 2016 21:19:22 +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 7314F285AC for ; Fri, 2 Dec 2016 21:19:21 +0000 (UTC) Received: from localhost ([::1]:36483 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCvEm-0004m4-F9 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 02 Dec 2016 16:19:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48121) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCvE5-0004gs-68 for qemu-devel@nongnu.org; Fri, 02 Dec 2016 16:18:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCvE4-0003JK-8o for qemu-devel@nongnu.org; Fri, 02 Dec 2016 16:18:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50326) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCvE4-0003J6-2y for qemu-devel@nongnu.org; Fri, 02 Dec 2016 16:18:36 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 4E631C04D31A for ; Fri, 2 Dec 2016 21:18:35 +0000 (UTC) Received: from localhost (ovpn-116-204.phx2.redhat.com [10.3.116.204]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uB2LIY6g007803; Fri, 2 Dec 2016 16:18:34 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 2 Dec 2016 19:18:04 -0200 Message-Id: <1480713496-11213-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1480713496-11213-1-git-send-email-ehabkost@redhat.com> References: <1480713496-11213-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 02 Dec 2016 21:18:35 +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] [PATCH for-2.9 05/17] qtest.py: Make 'binary' parameter 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 the 'binary' parameter is omitted, use the $QTEST_QEMU_BINARY environment variable. Signed-off-by: Eduardo Habkost --- Patch originally submitted as part of series: * [RFC v2 00/20] qmp: Report bus information on 'query-machines' --- scripts/qtest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/qtest.py b/scripts/qtest.py index 0496490..5a37b48 100644 --- a/scripts/qtest.py +++ b/scripts/qtest.py @@ -79,8 +79,10 @@ class QEMUQtestProtocol(object): class QEMUQtestMachine(qemu.QEMUMachine): '''A QEMU VM''' - def __init__(self, binary, args=[], name=None, test_dir="/var/tmp", + def __init__(self, binary=None, args=[], name=None, test_dir="/var/tmp", socket_scm_helper=None, logging=True): + if binary is None: + binary = os.getenv('QTEST_QEMU_BINARY') if name is None: name = "qemu-%d" % os.getpid() super(QEMUQtestMachine, self).__init__(binary, args, name=name, test_dir=test_dir,