From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3Wey-0006zC-RT for qemu-devel@nongnu.org; Mon, 20 Aug 2012 14:25:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T3Wex-0003qZ-Dx for qemu-devel@nongnu.org; Mon, 20 Aug 2012 14:25:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54766) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3Wex-0003q7-4I for qemu-devel@nongnu.org; Mon, 20 Aug 2012 14:25:07 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7KIP60i025662 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 20 Aug 2012 14:25:06 -0400 Date: Mon, 20 Aug 2012 19:25:02 +0100 From: "Daniel P. Berrange" Message-ID: <20120820182502.GB4801@redhat.com> References: <1345471297-21459-1-git-send-email-berrange@redhat.com> <20120820150311.5363c46e@doriath.home> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20120820150311.5363c46e@doriath.home> Subject: Re: [Qemu-devel] [PATCH] Hack qmp.py to support reading a JSON multi-line response Reply-To: "Daniel P. Berrange" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: qemu-devel@nongnu.org On Mon, Aug 20, 2012 at 03:03:11PM -0300, Luiz Capitulino wrote: > 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). Yeah, it is slightly unpleasant. > 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. How about making multi-line processing an optional feature, by adding a '-m' flag to qmp-shell. That way we still get error checking by default Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|