- 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 <vsement...@virtuozzo.com>
---
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=None):
if match is None:
return True
@@ -316,13 +322,11 @@ class QEMUMachine(object):
# Poll for new events
while True:
- event = self._qmp.pull_event(wait=timeout)
+ event = self._qmp.pull_event(wait=float(timeout))
if (event['event'] == name) and event_match(event, match):
return event
self._events.append(event)
- return None
-
def get_log(self):
'''
After self.shutdown or failed qemu execution, this returns the output
--
2.11.1
