aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorFam Zheng <famz@redhat.com>2014-02-24 13:45:01 +0800
committerLuiz Capitulino <lcapitulino@redhat.com>2014-02-28 13:35:53 -0500
commit4864512389b06389501e60d965edb8defb66a0fc (patch)
tree55c9edf860c1837d94d291c369687615027fd558 /scripts
parent7d6dc7f30c4781857ce230333da6ddd21fe0dcde (diff)
qmp: Check for returned data from __json_read in get_events
When QEMU process aborts and socket is closed, qmp client will not detect it. When this happens, some qemu-iotests scripts will enter an endless loop waiting for qmp events. It's better we raise an exception in qmp.py to catch this and make the test script stop. Signed-off-by: Fam Zheng <famz@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/qmp/qmp.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/qmp/qmp.py b/scripts/qmp/qmp.py
index 5c9717594f..20b6ec795e 100644
--- a/scripts/qmp/qmp.py
+++ b/scripts/qmp/qmp.py
@@ -171,7 +171,12 @@ class QEMUMonitorProtocol:
pass
self.__sock.setblocking(1)
if not self.__events and wait:
- self.__json_read(only_event=True)
+ ret = self.__json_read(only_event=True)
+ if ret == None:
+ # We are in blocking mode, if don't get anything, something
+ # went wrong
+ raise QMPConnectError("Error while reading from socket")
+
return self.__events
def clear_events(self):