From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3WSj-0001uu-Oi for qemu-devel@nongnu.org; Mon, 20 Aug 2012 14:12:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T3WSi-0008F7-Nv for qemu-devel@nongnu.org; Mon, 20 Aug 2012 14:12:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22279) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3WSi-0008Ey-ED for qemu-devel@nongnu.org; Mon, 20 Aug 2012 14:12:28 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7KICRdb001217 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 20 Aug 2012 14:12:27 -0400 Date: Mon, 20 Aug 2012 15:03:11 -0300 From: Luiz Capitulino Message-ID: <20120820150311.5363c46e@doriath.home> In-Reply-To: <1345471297-21459-1-git-send-email-berrange@redhat.com> References: <1345471297-21459-1-git-send-email-berrange@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [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: "Daniel P. Berrange" Cc: qemu-devel@nongnu.org On Mon, 20 Aug 2012 15:01:37 +0100 "Daniel P. Berrange" wrote: > 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 > + I'm reluctant about this, because it makes it impossible to detect bad json from qemu (not that qmp-shell handles this gracefully today). At the same time I can't think of anything simpler than your hack. What about calling json.loads() when closing } matches the number of opening ones? QMP responses are always dictionaries. > if 'event' in resp: > self.__events.append(resp) > if not only_event: