From patchwork Tue Jun 15 22:38:46 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v4,22/23] QMP: Fix python helper /wrt long return strings
Date: Tue, 15 Jun 2010 12:38:46 -0000
From: Jan Kiszka <jan.kiszka@web.de>
X-Patchwork-Id: 55825
Message-Id: <1f250c8ab6b283c00991d45834c0c61478a81bb6.1276641524.git.jan.kiszka@web.de>
To: qemu-devel@nongnu.org,
	Anthony Liguori <aliguori@us.ibm.com>
Cc: Juan Quintela <quintela@redhat.com>, Jan Kiszka <jan.kiszka@siemens.com>, 
 Markus Armbruster <armbru@redhat.com>,
 Luiz Capitulino <lcapitulino@redhat.com>,
 Blue Swirl <blauwirbel@gmail.com>, Avi Kivity <avi@redhat.com>

From: Jan Kiszka <jan.kiszka@siemens.com>

Remove the arbitrary limitation of 1024 characters per return string and
read complete lines instead. Required for device_show.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

---
QMP/qmp.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/QMP/qmp.py b/QMP/qmp.py
index d9da603..4062f84 100644
--- a/QMP/qmp.py
+++ b/QMP/qmp.py
@@ -63,10 +63,14 @@ class QEMUMonitorProtocol:
 
     def __json_read(self):
         try:
-            return json.loads(self.sock.recv(1024))
+            while True:
+                line = json.loads(self.sockfile.readline())
+                if not 'event' in line:
+                    return line
         except ValueError:
             return
 
     def __init__(self, filename):
         self.filename = filename
         self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        self.sockfile = self.sock.makefile()