From nobody Mon Feb 9 23:15:17 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 1511853451021897.851765302723; Mon, 27 Nov 2017 23:17:31 -0800 (PST) Received: from localhost ([::1]:36303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJa90-0000a1-9r for importer@patchew.org; Tue, 28 Nov 2017 02:17:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJa6B-0006lc-2J for qemu-devel@nongnu.org; Tue, 28 Nov 2017 02:14:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eJa67-0000Um-RH for qemu-devel@nongnu.org; Tue, 28 Nov 2017 02:14:31 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:9121 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eJa67-0000Tt-F8 for qemu-devel@nongnu.org; Tue, 28 Nov 2017 02:14:27 -0500 Received: from kvm.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id vAS7E9IK023611; Tue, 28 Nov 2017 10:14:10 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 28 Nov 2017 10:14:08 +0300 Message-Id: <20171128071409.21887-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20171128071409.21887-1-vsementsov@virtuozzo.com> References: <20171128071409.21887-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH 3/4] scripts/qemu.py: tiny enhancement for event_wiat 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: kwolf@redhat.com, vsementsov@virtuozzo.com, ehabkost@redhat.com, mreitz@redhat.com, crosa@redhat.com, den@openvz.org 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" - add comment - allow int timeout and disallow bool (which has special meaning for pull_event()) - remove unreachable 'return None' Signed-off-by: Vladimir Sementsov-Ogievskiy --- scripts/qemu.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/qemu.py b/scripts/qemu.py index 9bfdf6d37d..8763335254 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -291,7 +291,13 @@ class QEMUMachine(object): branch processing on match's value None {"foo": {"bar": 1}} matches {"foo": None} {"foo": {"bar": 1}} does not matches {"foo": {"baz": None}} + + @raise QMPTimeoutError: If timeout period elapses. + @raise QMPConnectError: If some other error occurred. ''' + + assert isinstance(timeout, float) or isinstance(timeout, int) + def event_match(event, match=3DNone): if match is None: return True @@ -316,13 +322,11 @@ class QEMUMachine(object): =20 # Poll for new events while True: - event =3D self._qmp.pull_event(wait=3Dtimeout) + event =3D self._qmp.pull_event(wait=3Dfloat(timeout)) if (event['event'] =3D=3D name) and event_match(event, match): return event self._events.append(event) =20 - return None - def get_log(self): ''' After self.shutdown or failed qemu execution, this returns the out= put --=20 2.11.1