From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53800)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1WJSSu-00052p-1f
	for qemu-devel@nongnu.org; Fri, 28 Feb 2014 13:47:25 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1WJSSo-0001EZ-J3
	for qemu-devel@nongnu.org; Fri, 28 Feb 2014 13:47:19 -0500
Received: from mx1.redhat.com ([209.132.183.28]:54692)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1WJSSo-0001EK-Ap
	for qemu-devel@nongnu.org; Fri, 28 Feb 2014 13:47:14 -0500
Received: from int-mx01.intmail.prod.int.phx2.redhat.com
	(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1SIlCnq016912
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Fri, 28 Feb 2014 13:47:13 -0500
Date: Fri, 28 Feb 2014 13:36:19 -0500
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20140228133619.2acad465@redhat.com>
In-Reply-To: <1393220701-27172-1-git-send-email-famz@redhat.com>
References: <1393220701-27172-1-git-send-email-famz@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] qmp: Check for returned data from
 __json_read in get_events
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Fam Zheng <famz@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>, qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>

On Mon, 24 Feb 2014 13:45:01 +0800
Fam Zheng <famz@redhat.com> wrote:

> 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>

Applied to the qmp branch, thanks.

> ---
>  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):