From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3SY9-0001sd-TB for qemu-devel@nongnu.org; Mon, 20 Aug 2012 10:01:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T3SY5-0002xz-OF for qemu-devel@nongnu.org; Mon, 20 Aug 2012 10:01:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5491) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3SY5-0002xq-GO for qemu-devel@nongnu.org; Mon, 20 Aug 2012 10:01:45 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7KE1ibt032519 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 20 Aug 2012 10:01:44 -0400 From: "Daniel P. Berrange" Date: Mon, 20 Aug 2012 15:01:37 +0100 Message-Id: <1345471297-21459-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH] Hack qmp.py to support reading a JSON multi-line response List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Luiz Capitulino From: "Daniel P. Berrange" The qmp-shell code assumes the JSON response is only on a single line. If the QEMU monitor is configured in "pretty print" mode the JSON response can be multi-line. The basic Python JSON APIs do not appear to support a streaming mode, so the simple hack here is to try parsing a line, and if it fails, then read another line, append it, and try parsing again. Keep reading lines until we can successfully parse Signed-off-by: Daniel P. Berrange --- QMP/qmp.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/QMP/qmp.py b/QMP/qmp.py index 36ecc1d..464a01a 100644 --- a/QMP/qmp.py +++ b/QMP/qmp.py @@ -61,10 +61,18 @@ class QEMUMonitorProtocol: def __json_read(self, only_event=False): while True: - data = self.__sockfile.readline() - if not data: - return - resp = json.loads(data) + data = "" + while True: + moredata = self.__sockfile.readline() + if not moredata: + return + data = data + moredata + try: + resp = json.loads(data) + break + except ValueError: + pass + if 'event' in resp: self.__events.append(resp) if not only_event: -- 1.7.11.2