summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJohn Snow2021-06-07 22:06:42 +0200
committerJohn Snow2021-06-18 22:10:07 +0200
commit26d3ce9e5e42920a6f9c1f481d900e63a636b07d (patch)
tree95da2198b6e31371482f13ba71dc07e0f9ca558e /scripts
parentscripts/qmp-shell: Fix empty-transaction invocation (diff)
downloadqemu-26d3ce9e5e42920a6f9c1f481d900e63a636b07d.tar.gz
qemu-26d3ce9e5e42920a6f9c1f481d900e63a636b07d.tar.xz
qemu-26d3ce9e5e42920a6f9c1f481d900e63a636b07d.zip
scripts/qmp-shell: Remove too-broad-exception
We are only anticipating QMPShellErrors here, for syntax we weren't able to understand. Other errors, if any, should be allowed to percolate upwards. Signed-off-by: John Snow <jsnow@redhat.com> Message-id: 20210607200649.1840382-36-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/qmp/qmp-shell11
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
index 78e4eae007..8d5845ab48 100755
--- a/scripts/qmp/qmp-shell
+++ b/scripts/qmp/qmp-shell
@@ -291,10 +291,13 @@ class QMPShell(qmp.QEMUMonitorProtocol):
def _execute_cmd(self, cmdline: str) -> bool:
try:
qmpcmd = self.__build_cmd(cmdline)
- except Exception as err:
- print('Error while parsing command line: %s' % err)
- print('command format: <command-name> ', end=' ')
- print('[arg-name1=arg1] ... [arg-nameN=argN]')
+ except QMPShellError as err:
+ print(
+ f"Error while parsing command line: {err!s}\n"
+ "command format: <command-name> "
+ "[arg-name1=arg1] ... [arg-nameN=argN",
+ file=sys.stderr
+ )
return True
# For transaction mode, we may have just cached the action:
if qmpcmd is None: