[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 04/14] python: rename QEMUMonitorProtocol.cmd() to cmd_raw()
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v6 04/14] python: rename QEMUMonitorProtocol.cmd() to cmd_raw() |
Date: |
Thu, 5 Oct 2023 16:55:40 +0300 |
Having cmd() and command() methods in one class doesn't look good.
Rename cmd() to cmd_raw(), to show its meaning better.
We also want to rename command() to cmd() in future, so this commit is
a necessary step.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
python/qemu/machine/machine.py | 2 +-
python/qemu/qmp/legacy.py | 4 ++--
tests/qemu-iotests/iotests.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
index 35d5a672db..dd1a79cb37 100644
--- a/python/qemu/machine/machine.py
+++ b/python/qemu/machine/machine.py
@@ -692,7 +692,7 @@ def qmp(self, cmd: str,
conv_keys = True
qmp_args = self._qmp_args(conv_keys, args)
- ret = self._qmp.cmd(cmd, args=qmp_args)
+ ret = self._qmp.cmd_raw(cmd, args=qmp_args)
if cmd == 'quit' and 'error' not in ret and 'return' in ret:
self._quit_issued = True
return ret
diff --git a/python/qemu/qmp/legacy.py b/python/qemu/qmp/legacy.py
index fe115e301c..e5fa1ce9c4 100644
--- a/python/qemu/qmp/legacy.py
+++ b/python/qemu/qmp/legacy.py
@@ -194,8 +194,8 @@ def cmd_obj(self, qmp_cmd: QMPMessage) -> QMPMessage:
)
)
- def cmd(self, name: str,
- args: Optional[Dict[str, object]] = None) -> QMPMessage:
+ def cmd_raw(self, name: str,
+ args: Optional[Dict[str, object]] = None) -> QMPMessage:
"""
Build a QMP command and send it to the QMP Monitor.
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index ef66fbd62b..8ffd9fb660 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -460,7 +460,7 @@ def __init__(self, *args: str, instance_id: str = 'a', qmp:
bool = False):
def qmp(self, cmd: str, args: Optional[Dict[str, object]] = None) \
-> QMPMessage:
assert self._qmp is not None
- return self._qmp.cmd(cmd, args)
+ return self._qmp.cmd_raw(cmd, args)
def get_qmp(self) -> QEMUMonitorProtocol:
assert self._qmp is not None
--
2.34.1
- [PATCH v6 02/14] qmp_shell.py: _fill_completion() use .command() instead of .cmd(), (continued)
- [PATCH v6 02/14] qmp_shell.py: _fill_completion() use .command() instead of .cmd(), Vladimir Sementsov-Ogievskiy, 2023/10/05
- [PATCH v6 01/14] python/qemu/qmp/legacy: cmd(): drop cmd_id unused argument, Vladimir Sementsov-Ogievskiy, 2023/10/05
- [PATCH v6 08/14] iotests: add some missed checks of qmp result, Vladimir Sementsov-Ogievskiy, 2023/10/05
- [PATCH v6 10/14] iotests: drop some occasional semicolons, Vladimir Sementsov-Ogievskiy, 2023/10/05
- [PATCH v6 06/14] python/machine.py: upgrade vm.cmd() method, Vladimir Sementsov-Ogievskiy, 2023/10/05
- [PATCH v6 04/14] python: rename QEMUMonitorProtocol.cmd() to cmd_raw(),
Vladimir Sementsov-Ogievskiy <=
- [PATCH v6 05/14] python/qemu: rename command() to cmd(), Vladimir Sementsov-Ogievskiy, 2023/10/05
- [PATCH v6 13/14] tests/vm/basevm.py: use cmd() instead of qmp(), Vladimir Sementsov-Ogievskiy, 2023/10/05
- [PATCH v6 12/14] iotests.py: pause_job(): drop return value, Vladimir Sementsov-Ogievskiy, 2023/10/05
- [PATCH v6 07/14] iotests: QemuStorageDaemon: add cmd() method like in QEMUMachine., Vladimir Sementsov-Ogievskiy, 2023/10/05
- [PATCH v6 09/14] iotests: refactor some common qmp result checks into generic pattern, Vladimir Sementsov-Ogievskiy, 2023/10/05