From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkxPR-0002tK-2k for qemu-devel@nongnu.org; Wed, 22 Apr 2015 12:21:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YkxPP-0000Yt-BW for qemu-devel@nongnu.org; Wed, 22 Apr 2015 12:21:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59992) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkxPP-0000Yp-6E for qemu-devel@nongnu.org; Wed, 22 Apr 2015 12:21:55 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id DEA4A8E70F for ; Wed, 22 Apr 2015 16:21:54 +0000 (UTC) From: John Snow Date: Wed, 22 Apr 2015 12:21:49 -0400 Message-Id: <1429719709-880-5-git-send-email-jsnow@redhat.com> In-Reply-To: <1429719709-880-1-git-send-email-jsnow@redhat.com> References: <1429719709-880-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/4] scripts: qmp-shell: Add verbose flag List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: John Snow , lcapitulino@redhat.com, kchamart@redhat.com Add a verbose flag that shows the QMP command that was constructed, to allow for later copy/pasting, reference, debugging, etc. Signed-off-by: John Snow Reviewed-by: Eric Blake --- scripts/qmp/qmp-shell | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell index 3fffe15..213f515 100755 --- a/scripts/qmp/qmp-shell +++ b/scripts/qmp/qmp-shell @@ -176,6 +176,12 @@ class QMPShell(qmp.QEMUMonitorProtocol): self.__cli_expr(cmdargs[1:], qmpcmd['arguments']) return qmpcmd + def _print(self, qmp): + if self._pp is not None: + self._pp.pprint(qmp) + else: + print qmp + def _execute_cmd(self, cmdline): try: qmpcmd = self.__build_cmd(cmdline) @@ -187,15 +193,13 @@ class QMPShell(qmp.QEMUMonitorProtocol): # For transaction mode, we may have just cached the action: if qmpcmd is None: return True + if self._verbose: + self._print(qmpcmd) resp = self.cmd_obj(qmpcmd) if resp is None: print 'Disconnected' return False - - if self._pp is not None: - self._pp.pprint(resp) - else: - print resp + self._print(resp) return True def connect(self): @@ -231,6 +235,9 @@ class QMPShell(qmp.QEMUMonitorProtocol): else: return self._execute_cmd(cmdline) + def set_verbosity(self, verbose): + self._verbose = verbose + class HMPShell(QMPShell): def __init__(self, address): QMPShell.__init__(self, address) @@ -316,6 +323,7 @@ def main(): qemu = None hmp = False pp = None + verbose = False try: for arg in sys.argv[1:]: @@ -327,6 +335,8 @@ def main(): if pp is not None: fail_cmdline(arg) pp = pprint.PrettyPrinter(indent=4) + elif arg == "-v": + verbose = True else: if qemu is not None: fail_cmdline(arg) @@ -351,6 +361,7 @@ def main(): die('Could not connect to %s' % addr) qemu.show_banner() + qemu.set_verbosity(verbose) while qemu.read_exec_command(qemu.get_prompt()): pass qemu.close() -- 2.1.0