From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C65BAA034E; Thu, 4 Jun 2020 11:09:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7DF3E1D5F3; Thu, 4 Jun 2020 11:09:46 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 388291D5DA for ; Thu, 4 Jun 2020 11:09:43 +0200 (CEST) IronPort-SDR: Q6P89wSwEvVB55OyQpYkASJRVFp32LAdkyqjqcsk6piIbwvZxqREInnx1WIqdhQf9p8HnR2q2G RWH7f//y9wkw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jun 2020 02:09:43 -0700 IronPort-SDR: v4VFe624hY+BfJbCjGkMVCjxkL5j3WQCXnNIGs6v5R9jxl+UfAeMFJHGq8xRus+miJD7W1YYc8 CUKYi1cujd5Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,471,1583222400"; d="scan'208";a="416847627" Received: from dpdk-lihong-ub1604.sh.intel.com ([10.67.118.174]) by orsmga004.jf.intel.com with ESMTP; 04 Jun 2020 02:09:42 -0700 From: lihong To: dts@dpdk.org, weix.xie@intel.com Cc: lihong Date: Thu, 4 Jun 2020 09:38:19 +0800 Message-Id: <1591234700-19815-2-git-send-email-lihongx.ma@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591234700-19815-1-git-send-email-lihongx.ma@intel.com> References: <1591234700-19815-1-git-send-email-lihongx.ma@intel.com> Subject: [dts] [PATCH V1 1/2] QMP: optimization file qemu-ga-client and qmp.py X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" 1. modify code to support python3 2. return None string if file not exist when use cat command Signed-off-by: lihong --- dep/QMP/qemu-ga-client | 10 ++++++---- dep/QMP/qmp.py | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dep/QMP/qemu-ga-client b/dep/QMP/qemu-ga-client index 46676c3..caf44b1 100755 --- a/dep/QMP/qemu-ga-client +++ b/dep/QMP/qemu-ga-client @@ -68,7 +68,7 @@ class QemuGuestAgentClient: def __file_read_all(self, handle): eof = False - data = '' + data = b'' while not eof: ret = self.qga.file_read(handle=handle, count=1024) _data = base64.b64decode(ret['buf-b64']) @@ -77,7 +77,10 @@ class QemuGuestAgentClient: return data def read(self, path): - handle = self.qga.file_open(path=path) + try: + handle = self.qga.file_open(path=path) + except: + return '' try: data = self.__file_read_all(handle) finally: @@ -162,7 +165,6 @@ class QemuGuestAgentClient: except self.qga.timeout: return - def _cmd_cat(client, args): if len(args) != 1: print('Invalid argument') @@ -259,7 +261,7 @@ def main(address, cmd, args): try: client = QemuGuestAgentClient(address) - except QemuGuestAgent.error, e: + except QemuGuestAgent.error as e: import errno print(e) diff --git a/dep/QMP/qmp.py b/dep/QMP/qmp.py index 9e6f4cf..430887d 100755 --- a/dep/QMP/qmp.py +++ b/dep/QMP/qmp.py @@ -108,7 +108,7 @@ class QEMUMonitorProtocol: been closed """ try: - self.__sock.sendall(json.dumps(qmp_cmd)) + self.__sock.sendall(str.encode(json.dumps(qmp_cmd))) except socket.error as err: if err[0] == errno.EPIPE: return @@ -135,7 +135,7 @@ class QEMUMonitorProtocol: if not ret: return else: - if 'error' in ret: + if 'error' in ret.keys(): raise Exception(ret['error']['desc']) return ret['return'] -- 2.7.4