From nobody Sat May 4 22:34:03 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; 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 1488567303953292.63938676065743; Fri, 3 Mar 2017 10:55:03 -0800 (PST) Received: from localhost ([::1]:59725 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjsM2-0001JR-If for importer@patchew.org; Fri, 03 Mar 2017 13:55:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjsLa-0001JK-Oz for qemu-devel@nongnu.org; Fri, 03 Mar 2017 13:54:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjsLV-00077Y-T1 for qemu-devel@nongnu.org; Fri, 03 Mar 2017 13:54:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36456) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cjsLV-00076Z-N6 for qemu-devel@nongnu.org; Fri, 03 Mar 2017 13:54:29 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8EB3EC0567A1 for ; Fri, 3 Mar 2017 18:54:29 +0000 (UTC) Received: from scv.usersys.redhat.com (dhcp-17-221.bos.redhat.com [10.18.17.221]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v23IsSPP020254; Fri, 3 Mar 2017 13:54:28 -0500 From: John Snow To: qemu-devel@nongnu.org Date: Fri, 3 Mar 2017 13:54:27 -0500 Message-Id: <20170303185427.32681-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 03 Mar 2017 18:54:29 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2] qmp-shell: add persistent command history 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: John Snow , armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use the existing readline history function we are utilizing to provide persistent command history across instances of qmp-shell. This assists entering debug commands across sessions that may be interrupted by QEMU sessions terminating, where the qmp-shell has to be relaunched. Signed-off-by: John Snow Reviewed-by: Nir Soffer --- v2: Adjusted the errors to whine about non-ENOENT errors, but still intercept all errors as non-fatal. Save history atexit() to match bash standard behavior scripts/qmp/qmp-shell | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell index 0373b24..55a8285 100755 --- a/scripts/qmp/qmp-shell +++ b/scripts/qmp/qmp-shell @@ -70,6 +70,9 @@ import json import ast import readline import sys +import os +import errno +import atexit =20 class QMPCompleter(list): def complete(self, text, state): @@ -109,6 +112,7 @@ class QMPShell(qmp.QEMUMonitorProtocol): self._pretty =3D pretty self._transmode =3D False self._actions =3D list() + self._histfile =3D os.path.join(os.path.expanduser('~'), '.qmp_his= tory') =20 def __get_address(self, arg): """ @@ -137,6 +141,21 @@ class QMPShell(qmp.QEMUMonitorProtocol): # XXX: default delimiters conflict with some command names (eg. qu= ery-), # clearing everything as it doesn't seem to matter readline.set_completer_delims('') + try: + readline.read_history_file(self._histfile) + except Exception as e: + if isinstance(e, IOError) and e.errno =3D=3D errno.ENOENT: + # File not found. No problem. + pass + else: + print "Failed to read history '%s'; %s" % (self._histfile,= e) + atexit.register(self.__save_history) + + def __save_history(self): + try: + readline.write_history_file(self._histfile) + except Exception as e: + print "Failed to save history file '%s'; %s" % (self._histfile= , e) =20 def __parse_value(self, val): try: --=20 2.9.3