From nobody Tue Feb 10 05:27:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522359729123720.1029768850816; Thu, 29 Mar 2018 14:42:09 -0700 (PDT) Received: from localhost ([::1]:60143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1fJA-0003zD-6P for importer@patchew.org; Thu, 29 Mar 2018 17:42:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1fHA-0002Qx-Nj for qemu-devel@nongnu.org; Thu, 29 Mar 2018 17:40:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f1fH8-0001Ne-V4 for qemu-devel@nongnu.org; Thu, 29 Mar 2018 17:40:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57850) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f1fH8-0001Mx-Mk for qemu-devel@nongnu.org; Thu, 29 Mar 2018 17:40:02 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E26A528209; Thu, 29 Mar 2018 21:40:01 +0000 (UTC) Received: from localhost (ovpn-116-15.gru2.redhat.com [10.97.116.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58560601AE; Thu, 29 Mar 2018 21:39:55 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 29 Mar 2018 18:38:48 -0300 Message-Id: <20180329213857.15499-10-ehabkost@redhat.com> In-Reply-To: <20180329213857.15499-1-ehabkost@redhat.com> References: <20180329213857.15499-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 29 Mar 2018 21:40:01 +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 09/18] qemu.py: Make monitor 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: , Cc: Thomas Huth , Amador Pahim , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Cleber Rosa , Marcel Apfelbaum , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This will allow us to use the QEMUMachine class on test cases that don't use QMP at all. Signed-off-by: Eduardo Habkost --- scripts/qemu.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/scripts/qemu.py b/scripts/qemu.py index 1241e7f10b..e82540a235 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -54,7 +54,7 @@ class QEMUMachine(object): ''' =20 def __init__(self, binary, args=3DNone, wrapper=3DNone, name=3DNone, - test_dir=3D"/var/tmp", monitor_address=3DNone, + test_dir=3D"/var/tmp", monitor_address=3DNone, qmp=3DTrue, socket_scm_helper=3DNone): ''' Initialize a QEMUMachine @@ -65,6 +65,7 @@ class QEMUMachine(object): @param name: prefix for socket and log file names (default: qemu-P= ID) @param test_dir: where to create socket and log file @param monitor_address: address for QMP monitor + @param qmp: if False, disable QMP monitor @param socket_scm_helper: helper program, required for send_fd_scm= ()" @note: Qemu process is not started until launch() is used. ''' @@ -90,6 +91,7 @@ class QEMUMachine(object): self._test_dir =3D test_dir self._temp_dir =3D None self._launched =3D False + self._qmp_enabled =3D qmp =20 # just in case logging wasn't configured by the main script: logging.basicConfig() @@ -168,13 +170,18 @@ class QEMUMachine(object): self._iolog =3D iolog.read() =20 def _vm_monitor(self): - if self._monitor_address is not None: + if not self._qmp_enabled: + return None + elif self._monitor_address is not None: return self._monitor_address else: return os.path.join(self._temp_dir, self._name + "-monitor.soc= k") =20 def _monitor_args(self): addr =3D self._vm_monitor() + if addr is None: + return [] + if isinstance(addr, tuple): moncdev =3D "socket,id=3Dmon,host=3D%s,port=3D%s" % (addr[0], = addr[1]) else: @@ -193,10 +200,14 @@ class QEMUMachine(object): self._qemu_log_path =3D os.path.join(self._temp_dir, self._name + = ".log") self._qemu_log_file =3D open(self._qemu_log_path, 'wb') =20 - self._qmp =3D qmp.qmp.QEMUMonitorProtocol(self._vm_monitor(), serv= er=3DTrue) + self._qmp =3D \ + qmp.qmp.QEMUMonitorProtocol(self._vm_monitor(), server=3DTrue)= \ + if self._qmp_enabled \ + else None =20 def _post_launch(self): - self._qmp.accept() + if self._qmp: + self._qmp.accept() =20 def _post_shutdown(self): if self._qmp is not None: --=20 2.14.3