From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxCdn-0001bH-Sh for qemu-devel@nongnu.org; Wed, 27 Sep 2017 09:44:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dxCdi-0003GE-3z for qemu-devel@nongnu.org; Wed, 27 Sep 2017 09:44:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57602) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dxCdh-0003Fn-Si for qemu-devel@nongnu.org; Wed, 27 Sep 2017 09:44:38 -0400 Date: Wed, 27 Sep 2017 10:44:31 -0300 From: Eduardo Habkost Message-ID: <20170927134431.GN21016@localhost.localdomain> References: <20170927130339.21444-1-ehabkost@redhat.com> <20170927130339.21444-5-ehabkost@redhat.com> <20170927133321.GB8521@lemon.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170927133321.GB8521@lemon.lan> Subject: [Qemu-devel] [PATCH] fixup! scripts: Remove debug parameter from QEMUMonitorProtocol List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: =?utf-8?B?THVrw6HFoQ==?= Doktor , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Alex =?iso-8859-1?Q?Benn=E9e?= , qemu-devel@nongnu.org, Cleber Rosa On Wed, Sep 27, 2017 at 09:33:21PM +0800, Fam Zheng wrote: > On Wed, 09/27 10:03, Eduardo Habkost wrote: > > @@ -51,7 +54,6 @@ class QEMUMonitorProtocol(object): > > """ > > self.__events = [] > > self.__address = address > > - self._debug = debug > > Should you also drop the debug parameter from the method? > > > self.__sock = self.__get_sock() > > self.__sockfile = None > > if server: > > @@ -83,8 +85,7 @@ class QEMUMonitorProtocol(object): > > return > > resp = json.loads(data) > > if 'event' in resp: > > - if self._debug: > > - print >>sys.stderr, "QMP:<<< %s" % resp > > + self.logger.debug("<<< %s", resp) > > self.__events.append(resp) > > if not only_event: > > continue > > @@ -164,8 +165,7 @@ class QEMUMonitorProtocol(object): > > @return QMP response as a Python dict or None if the connection has > > been closed > > """ > > - if self._debug: > > - print >>sys.stderr, "QMP:>>> %s" % qmp_cmd > > + self.logger.debug("<<< %s", qmp_cmd) > > This should be ">>> %s". > Fixed. Signed-off-by: Eduardo Habkost --- scripts/qmp/qmp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/qmp/qmp.py b/scripts/qmp/qmp.py index be79d7aa80..369d9fef39 100644 --- a/scripts/qmp/qmp.py +++ b/scripts/qmp/qmp.py @@ -40,7 +40,7 @@ class QEMUMonitorProtocol(object): #: Socket's timeout timeout = socket.timeout - def __init__(self, address, server=False, debug=False): + def __init__(self, address, server=False): """ Create a QEMUMonitorProtocol class. @@ -165,7 +165,7 @@ class QEMUMonitorProtocol(object): @return QMP response as a Python dict or None if the connection has been closed """ - self.logger.debug("<<< %s", qmp_cmd) + self.logger.debug(">>> %s", qmp_cmd) try: self.__sock.sendall(json.dumps(qmp_cmd)) except socket.error as err: -- 2.13.5