From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: John Snow <jsnow@redhat.com>
Subject: [Qemu-devel] [PULL v3 24/28] qmp-shell: add persistent command history
Date: Tue, 9 May 2017 10:06:41 +0200 [thread overview]
Message-ID: <1494317205-2211-25-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1494317205-2211-1-git-send-email-armbru@redhat.com>
From: John Snow <jsnow@redhat.com>
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 <jsnow@redhat.com>
Message-Id: <20170427223628.20893-1-jsnow@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Kashyap Chamarthy <kchamart@redhat.com>
Tested-by: Kashyap Chamarthy <kchamart@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qmp/qmp-shell | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
index eccb88a..6ece6e7 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
class QMPCompleter(list):
def complete(self, text, state):
@@ -109,6 +112,8 @@ class QMPShell(qmp.QEMUMonitorProtocol):
self._pretty = pretty
self._transmode = False
self._actions = list()
+ self._histfile = os.path.join(os.path.expanduser('~'),
+ '.qmp-shell_history')
def __get_address(self, arg):
"""
@@ -132,11 +137,27 @@ class QMPShell(qmp.QEMUMonitorProtocol):
def __completer_setup(self):
self._completer = QMPCompleter()
self._fill_completion()
+ readline.set_history_length(1024)
readline.set_completer(self._completer.complete)
readline.parse_and_bind("tab: complete")
# XXX: default delimiters conflict with some command names (eg. query-),
# 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 == 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)
def __parse_value(self, val):
try:
--
2.7.4
next prev parent reply other threads:[~2017-05-09 8:07 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-09 8:06 [Qemu-devel] [PULL v3 00/28] QAPI patches for 2017-05-04 Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 01/28] tests/check-qdict: Fix missing brackets Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 02/28] test-keyval: fix leaks Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 03/28] pci: Use struct instead of QDict to pass back parameters Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 04/28] pci: Reduce scope of error injection Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 05/28] coccinelle: Add script to remove useless QObject casts Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 06/28] qobject: Drop " Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 07/28] qobject: Add helper macros for common scalar insertions Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 08/28] qobject: Use simpler QDict/QList scalar insertion macros Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 09/28] block: Simplify bdrv_append_temp_snapshot() logic Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 10/28] QemuOpts: Simplify qemu_opts_to_qdict() Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 11/28] fdc-test: Avoid deprecated 'change' command Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 12/28] test-qga: Actually test 0xff sync bytes Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 13/28] sockets: Prepare vsock_parse() for flattened SocketAddress Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 14/28] sockets: Prepare inet_parse() " Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 15/28] qapi: New QAPI_CLONE_MEMBERS() Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 16/28] sockets: Rename SocketAddress to SocketAddressLegacy Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 17/28] sockets: Rename SocketAddressFlat to SocketAddress Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 18/28] sockets: Limit SocketAddressLegacy to external interfaces Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 19/28] sockets: Delete unused helper socket_address_crumple() Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 20/28] qmp: Improve QMP dispatch error messages Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 21/28] qobject-input-visitor: Document full_name_nth() Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 22/28] qapi: Document intended use of @name within alternate visits Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 23/28] qobject-input-visitor: Catch misuse of end_struct vs. end_list Markus Armbruster
2017-05-09 8:06 ` Markus Armbruster [this message]
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 25/28] qmp-shell: add -N option to skip negotiate Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 26/28] qmp-shell: Cope with query-commands error Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 27/28] qmp-shell: don't show version greeting if unavailable Markus Armbruster
2017-05-09 8:06 ` [Qemu-devel] [PULL v3 28/28] qmp-shell: improve help Markus Armbruster
2017-05-09 17:52 ` [Qemu-devel] [PULL v3 00/28] QAPI patches for 2017-05-04 Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1494317205-2211-25-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=jsnow@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).