[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/32] qmp: Check for returned data from __json_read
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 17/32] qmp: Check for returned data from __json_read in get_events |
Date: |
Mon, 3 Mar 2014 12:12:08 -0500 |
From: Fam Zheng <address@hidden>
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 <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
scripts/qmp/qmp.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/scripts/qmp/qmp.py b/scripts/qmp/qmp.py
index 5c97175..20b6ec7 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):
--
1.8.1.4
- [Qemu-devel] [PULL 11/32] dump: add API to write dump_bitmap, (continued)
- [Qemu-devel] [PULL 11/32] dump: add API to write dump_bitmap, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 06/32] dump: add API to write vmcore, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 12/32] dump: add APIs to operate DataCache, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 10/32] dump: add API to write dump header, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 03/32] dump: const-qualify the buf of WriteCoreDumpFunction, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 14/32] dump: make kdump-compressed format available for 'dump-guest-memory', Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 13/32] dump: add API to write dump pages, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 15/32] Define the architecture for compressed dump format, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 16/32] dump: add 'query-dump-guest-memory-capability' command, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 17/32] qmp: Check for returned data from __json_read in get_events,
Luiz Capitulino <=
- [Qemu-devel] [PULL 19/32] monitor: Remove left-over code in do_info_profile., Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 18/32] qerror: Improve QERR_DEVICE_NOT_ACTIVE message, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 22/32] tests/qapi-schema: Cover simple argument types, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 20/32] tests/qapi-schema: Actually check successful QMP command response, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 21/32] tests/qapi-schema: Cover optional command arguments, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 24/32] tests/qapi-schema: Cover complex types with base, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 23/32] tests/qapi-schema: Cover anonymous union types, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 26/32] tests/qapi-schema: Cover flat union types, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 25/32] tests/qapi-schema: Cover union types with base, Luiz Capitulino, 2014/03/03
- [Qemu-devel] [PULL 31/32] qapi: Clean up superfluous null check in qapi_dealloc_type_str(), Luiz Capitulino, 2014/03/03