[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/11] python/machine.py: upgrade vm.cmd() method
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v2 03/11] python/machine.py: upgrade vm.cmd() method |
Date: |
Mon, 6 Jun 2022 10:27:23 +0300 |
The method is not popular in iotests, we prefer use vm.qmp() and then
check success by hand.. But that's not optimal. To simplify movement to
vm.cmd() let's support same interface improvements like in vm.qmp().
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
python/qemu/machine/machine.py | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
index 65703176e5..10d3304dcf 100644
--- a/python/qemu/machine/machine.py
+++ b/python/qemu/machine/machine.py
@@ -649,13 +649,23 @@ def qmp(self, cmd: str,
return ret
def cmd(self, cmd: str,
- conv_keys: bool = True,
+ args_dict: Optional[Dict[str, object]] = None,
+ conv_keys: Optional[bool] = None,
**args: Any) -> QMPReturnValue:
"""
Invoke a QMP command.
On success return the response dict.
On failure raise an exception.
"""
+ if args_dict is not None:
+ assert not args
+ assert conv_keys is None
+ args = args_dict
+ conv_keys = False
+
+ if conv_keys is None:
+ conv_keys = True
+
qmp_args = self._qmp_args(conv_keys, args)
ret = self._qmp.cmd(cmd, **qmp_args)
if cmd == 'quit':
--
2.25.1
- [PATCH v2 00/11] iotests: use vm.cmd(), Vladimir Sementsov-Ogievskiy, 2022/06/06
- [PATCH v2 01/11] python: rename QEMUMonitorProtocol.cmd() to cmd_raw(), Vladimir Sementsov-Ogievskiy, 2022/06/06
- [PATCH v2 04/11] iotests: QemuStorageDaemon: add cmd() method like in QEMUMachine., Vladimir Sementsov-Ogievskiy, 2022/06/06
- [PATCH v2 05/11] iotests: add some missed checks of qmp result, Vladimir Sementsov-Ogievskiy, 2022/06/06
- [PATCH v2 07/11] iotests: drop some occasional semicolons, Vladimir Sementsov-Ogievskiy, 2022/06/06
- [PATCH v2 09/11] iotests.py: pause_job(): drop return value, Vladimir Sementsov-Ogievskiy, 2022/06/06
- [PATCH v2 10/11] tests/vm/basevm.py: use cmd() instead of qmp(), Vladimir Sementsov-Ogievskiy, 2022/06/06
- [PATCH v2 03/11] python/machine.py: upgrade vm.cmd() method,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v2 06/11] iotests: refactor some common qmp result checks into generic pattern, Vladimir Sementsov-Ogievskiy, 2022/06/06
- [PATCH v2 08/11] iotests: drop some extra ** in qmp() call, Vladimir Sementsov-Ogievskiy, 2022/06/06
- [PATCH v2 02/11] python/qemu: rename command() to cmd(), Vladimir Sementsov-Ogievskiy, 2022/06/06
- [PATCH v2 11/11] python: use vm.cmd() instead of vm.qmp() where appropriate, Vladimir Sementsov-Ogievskiy, 2022/06/06