[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 04/16] qmp_shell.py: _fill_completion() use .command() instead
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v5 04/16] qmp_shell.py: _fill_completion() use .command() instead of .cmd() |
Date: |
Wed, 15 Feb 2023 16:25:35 +0300 |
We just want to ignore failure, so we don't need low level .cmd(). This
helps further renaming .command() to .cmd().
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
python/qemu/qmp/qmp_shell.py | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/python/qemu/qmp/qmp_shell.py b/python/qemu/qmp/qmp_shell.py
index 619ab42ced..988d79c01b 100644
--- a/python/qemu/qmp/qmp_shell.py
+++ b/python/qemu/qmp/qmp_shell.py
@@ -91,14 +91,21 @@
import sys
from typing import (
IO,
+ Dict,
Iterator,
List,
NoReturn,
Optional,
Sequence,
+ cast,
)
-from qemu.qmp import ConnectError, QMPError, SocketAddrT
+from qemu.qmp import (
+ ConnectError,
+ ExecuteError,
+ QMPError,
+ SocketAddrT,
+)
from qemu.qmp.legacy import (
QEMUMonitorProtocol,
QMPBadPortError,
@@ -194,11 +201,12 @@ def close(self) -> None:
super().close()
def _fill_completion(self) -> None:
- cmds = self.cmd('query-commands')
- if 'error' in cmds:
- return
- for cmd in cmds['return']:
- self._completer.append(cmd['name'])
+ try:
+ cmds = cast(List[Dict[str, str]], self.command('query-commands'))
+ for cmd in cmds:
+ self._completer.append(cmd['name'])
+ except ExecuteError:
+ pass
def _completer_setup(self) -> None:
self._completer = QMPCompleter()
--
2.34.1
- [PATCH v5 00/16] iotests: use vm.cmd(), Vladimir Sementsov-Ogievskiy, 2023/02/15
- [PATCH v5 01/16] python: fix superfluous-parens pylint error, Vladimir Sementsov-Ogievskiy, 2023/02/15
- [PATCH v5 03/16] python/qemu/qmp/legacy: cmd(): drop cmd_id unused argument, Vladimir Sementsov-Ogievskiy, 2023/02/15
- [PATCH v5 04/16] qmp_shell.py: _fill_completion() use .command() instead of .cmd(),
Vladimir Sementsov-Ogievskiy <=
- [PATCH v5 02/16] python: fix broad-exception-raised pylint error, Vladimir Sementsov-Ogievskiy, 2023/02/15
- [PATCH v5 06/16] python: rename QEMUMonitorProtocol.cmd() to cmd_raw(), Vladimir Sementsov-Ogievskiy, 2023/02/15
- [PATCH v5 08/16] python/machine.py: upgrade vm.cmd() method, Vladimir Sementsov-Ogievskiy, 2023/02/15
- [PATCH v5 05/16] scripts/cpu-x86-uarch-abi.py: use .command() instead of .cmd(), Vladimir Sementsov-Ogievskiy, 2023/02/15
- [PATCH v5 07/16] python/qemu: rename command() to cmd(), Vladimir Sementsov-Ogievskiy, 2023/02/15
- [PATCH v5 09/16] iotests: QemuStorageDaemon: add cmd() method like in QEMUMachine., Vladimir Sementsov-Ogievskiy, 2023/02/15
- [PATCH v5 10/16] iotests: add some missed checks of qmp result, Vladimir Sementsov-Ogievskiy, 2023/02/15
- [PATCH v5 12/16] iotests: drop some occasional semicolons, Vladimir Sementsov-Ogievskiy, 2023/02/15
- [PATCH v5 14/16] iotests.py: pause_job(): drop return value, Vladimir Sementsov-Ogievskiy, 2023/02/15