From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37620 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUPL3-0006Sh-AA for qemu-devel@nongnu.org; Thu, 01 Jul 2010 15:22:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUPKs-0007It-39 for qemu-devel@nongnu.org; Thu, 01 Jul 2010 15:22:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7189) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUPKr-0007Ih-QR for qemu-devel@nongnu.org; Thu, 01 Jul 2010 15:22:10 -0400 From: Luiz Capitulino Date: Thu, 1 Jul 2010 16:21:33 -0300 Message-Id: <1278012111-26227-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1278012111-26227-1-git-send-email-lcapitulino@redhat.com> References: <1278012111-26227-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 05/23] QMP: Fix python helper /wrt long return strings List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: Jan Kiszka , qemu-devel@nongnu.org From: Jan Kiszka Remove the arbitrary limitation of 1024 characters per return string and read complete lines instead. Required for device_show. Signed-off-by: Jan Kiszka Signed-off-by: Luiz Capitulino --- 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() -- 1.7.2.rc0