From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKWYe-0002h5-8d for qemu-devel@nongnu.org; Mon, 03 Mar 2014 12:21:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKWYY-0003LL-OH for qemu-devel@nongnu.org; Mon, 03 Mar 2014 12:21:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKWYY-0003L7-FF for qemu-devel@nongnu.org; Mon, 03 Mar 2014 12:21:34 -0500 From: Luiz Capitulino Date: Mon, 3 Mar 2014 12:12:08 -0500 Message-Id: <1393866743-17385-18-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1393866743-17385-1-git-send-email-lcapitulino@redhat.com> References: <1393866743-17385-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PULL 17/32] qmp: Check for returned data from __json_read in get_events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: qemu-devel@nongnu.org, anthony@codemonkey.ws From: Fam Zheng 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 Reviewed-by: Stefan Hajnoczi Signed-off-by: Luiz Capitulino --- 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