From nobody Wed May 15 18:35:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1498850003608917.09237678151; Fri, 30 Jun 2017 12:13:23 -0700 (PDT) Received: from localhost ([::1]:45674 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dR1M0-0000a5-5L for importer@patchew.org; Fri, 30 Jun 2017 15:13:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dR1Ix-00078y-87 for qemu-devel@nongnu.org; Fri, 30 Jun 2017 15:10:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dR1Iu-0003Xx-3H for qemu-devel@nongnu.org; Fri, 30 Jun 2017 15:10:11 -0400 Received: from research.iiit.ac.in ([196.12.53.8]:38912) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dR1It-0003PV-2P for qemu-devel@nongnu.org; Fri, 30 Jun 2017 15:10:08 -0400 Received: from localhost (localhost [127.0.0.1]) by research.iiit.ac.in (Postfix) with ESMTP id 519CB741F51; Sat, 1 Jul 2017 00:39:57 +0530 (IST) Received: from research.iiit.ac.in ([127.0.0.1]) by localhost (research.iiit.ac.in [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id pqv5GW3kWE08; Sat, 1 Jul 2017 00:39:55 +0530 (IST) Received: from localhost (localhost [127.0.0.1]) by research.iiit.ac.in (Postfix) with ESMTP id 70B44741F55; Sat, 1 Jul 2017 00:39:55 +0530 (IST) Received: from research.iiit.ac.in ([127.0.0.1]) by localhost (research.iiit.ac.in [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id mp9QF5Foovy1; Sat, 1 Jul 2017 00:39:55 +0530 (IST) Received: from ishani-Inspiron-5558.domain.name (unknown [122.171.29.36]) by research.iiit.ac.in (Postfix) with ESMTPSA id 265CB741F51; Sat, 1 Jul 2017 00:39:53 +0530 (IST) DKIM-Filter: OpenDKIM Filter v2.9.2 research.iiit.ac.in 70B44741F55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=research.iiit.ac.in; s=4E8815E6-5B55-11E4-B758-8D4964374E96; t=1498849795; bh=cjG4vqRvbW0IDbA0WMiBLI/X6afBOWHIJaoox0mxfZI=; h=From:To:Subject:Date:Message-Id; b=GBivaSYdYs23N4jFwCvsh4THtiewrI6nmOFcSDoZy0UYxYRSgReuO+HgvsogKjeJB ynyyRgQHK3cT0LFOFdjq3FlXP+QDSWNpwjDBfSfPdVxOjwV+YKcSWiN2/itkIvM26m 5BQpou3RZmq8yaCEDM7X0STzRMbA7HPOBt2TN+C4= X-Virus-Scanned: amavisd-new at research.iiit.ac.in From: Ishani Chugh To: qemu-devel@nongnu.org Date: Sat, 1 Jul 2017 00:39:41 +0530 Message-Id: <1498849781-12776-1-git-send-email-chugh.ishani@research.iiit.ac.in> X-Mailer: git-send-email 2.7.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 196.12.53.8 Subject: [Qemu-devel] [PATCH] Python3 Support for qmp.py X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ishani Chugh , jsnow@redhat.com, stefanha@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch intends to make qmp.py compatible with both python2 and python3. Signed-off-by: Ishani Chugh --- scripts/qmp/qmp.py | 66 +++++++++++++++++++++++++++++++++++---------------= ---- 1 file changed, 43 insertions(+), 23 deletions(-) diff --git a/scripts/qmp/qmp.py b/scripts/qmp/qmp.py index 62d3651..9926c36 100644 --- a/scripts/qmp/qmp.py +++ b/scripts/qmp/qmp.py @@ -13,18 +13,23 @@ import errno import socket import sys =20 + class QMPError(Exception): pass =20 + class QMPConnectError(QMPError): pass =20 + class QMPCapabilitiesError(QMPError): pass =20 + class QMPTimeoutError(QMPError): pass =20 + class QEMUMonitorProtocol: def __init__(self, address, server=3DFalse, debug=3DFalse): """ @@ -42,6 +47,7 @@ class QEMUMonitorProtocol: self.__address =3D address self._debug =3D debug self.__sock =3D self.__get_sock() + self.data =3D b"" if server: self.__sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR,= 1) self.__sock.bind(self.__address) @@ -56,23 +62,35 @@ class QEMUMonitorProtocol: =20 def __negotiate_capabilities(self): greeting =3D self.__json_read() - if greeting is None or not greeting.has_key('QMP'): + if greeting is None or 'QMP' not in greeting: raise QMPConnectError - # Greeting seems ok, negotiate capabilities resp =3D self.cmd('qmp_capabilities') if "return" in resp: return greeting raise QMPCapabilitiesError =20 + def __sock_readline(self): + while True: + ch =3D self.__sock.recv(1) + if ch is None: + if self.data: + raise ValueError('socket closed mid-line') + return None + self.data +=3D ch + if ch =3D=3D b'\n': + line =3D self.data.decode('utf-8') + self.data =3D b"" + return line + def __json_read(self, only_event=3DFalse): while True: - data =3D self.__sockfile.readline() + data =3D self.__sock_readline() if not data: return resp =3D json.loads(data) if 'event' in resp: if self._debug: - print >>sys.stderr, "QMP:<<< %s" % resp + print("QMP:<<< %s" % resp) self.__events.append(resp) if not only_event: continue @@ -87,18 +105,18 @@ class QEMUMonitorProtocol: @param wait (bool): block until an event is available. @param wait (float): If wait is a float, treat it as a timeout val= ue. =20 - @raise QMPTimeoutError: If a timeout float is provided and the tim= eout - period elapses. - @raise QMPConnectError: If wait is True but no events could be ret= rieved - or if some other error occurred. + @raise QMPTimeoutError: If a timeout float is provided and the + timeout period elapses. + @raise QMPConnectError: If wait is True but no events could be + retrieved or if some other error occurred. """ =20 # Check for new events regardless and pull them into the cache: self.__sock.setblocking(0) try: - self.__json_read() + test =3D self.__json_read() except socket.error as err: - if err[0] =3D=3D errno.EAGAIN: + if err.errno =3D=3D errno.EAGAIN: # No data available pass self.__sock.setblocking(1) @@ -128,7 +146,7 @@ class QEMUMonitorProtocol: @raise QMPCapabilitiesError if fails to negotiate capabilities """ self.__sock.connect(self.__address) - self.__sockfile =3D self.__sock.makefile() + self.__sockfile =3D self.__sock.makefile('rb') if negotiate: return self.__negotiate_capabilities() =20 @@ -143,7 +161,7 @@ class QEMUMonitorProtocol: """ self.__sock.settimeout(15) self.__sock, _ =3D self.__sock.accept() - self.__sockfile =3D self.__sock.makefile() + self.__sockfile =3D self.__sock.makefile('rb') return self.__negotiate_capabilities() =20 def cmd_obj(self, qmp_cmd): @@ -155,16 +173,17 @@ class QEMUMonitorProtocol: been closed """ if self._debug: - print >>sys.stderr, "QMP:>>> %s" % qmp_cmd + print("QMP:>>> %s" % qmp_cmd) try: - self.__sock.sendall(json.dumps(qmp_cmd)) + command =3D json.dumps(qmp_cmd) + self.__sock.sendall(command.encode('UTF-8')) except socket.error as err: - if err[0] =3D=3D errno.EPIPE: + if err.errno =3D=3D errno.EPIPE: return - raise socket.error(err) + raise resp =3D self.__json_read() if self._debug: - print >>sys.stderr, "QMP:<<< %s" % resp + print("QMP:<<< %s" % resp) return resp =20 def cmd(self, name, args=3DNone, id=3DNone): @@ -175,7 +194,7 @@ class QEMUMonitorProtocol: @param args: command arguments (dict) @param id: command id (dict, list, string or int) """ - qmp_cmd =3D { 'execute': name } + qmp_cmd =3D {'execute': name} if args: qmp_cmd['arguments'] =3D args if id: @@ -184,7 +203,7 @@ class QEMUMonitorProtocol: =20 def command(self, cmd, **kwds): ret =3D self.cmd(cmd, kwds) - if ret.has_key('error'): + if 'error' in ret: raise Exception(ret['error']['desc']) return ret['return'] =20 @@ -197,8 +216,8 @@ class QEMUMonitorProtocol: =20 @raise QMPTimeoutError: If a timeout float is provided and the tim= eout period elapses. - @raise QMPConnectError: If wait is True but no events could be ret= rieved - or if some other error occurred. + @raise QMPConnectError: If wait is True but no events could be + retrieved or if some other error occurred. =20 @return The first available QMP event, or None. """ @@ -217,8 +236,8 @@ class QEMUMonitorProtocol: =20 @raise QMPTimeoutError: If a timeout float is provided and the tim= eout period elapses. - @raise QMPConnectError: If wait is True but no events could be ret= rieved - or if some other error occurred. + @raise QMPConnectError: If wait is True but no events could be + retrieved or if some other error occurred. =20 @return The list of available QMP events. """ @@ -245,3 +264,4 @@ class QEMUMonitorProtocol: =20 def is_scm_available(self): return self.__sock.family =3D=3D socket.AF_UNIX + --=20 2.7.4