Browse Source

python: rename QEMUMonitorProtocol.cmd() to cmd_raw()

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>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20231006154125.1068348-5-vsementsov@yandex-team.ru
Signed-off-by: John Snow <jsnow@redhat.com>
Vladimir Sementsov-Ogievskiy 1 year ago
parent
commit
37274707f6
3 changed files with 4 additions and 4 deletions
  1. 1 1
      python/qemu/machine/machine.py
  2. 2 2
      python/qemu/qmp/legacy.py
  3. 1 1
      tests/qemu-iotests/iotests.py

+ 1 - 1
python/qemu/machine/machine.py

@@ -702,7 +702,7 @@ def qmp(self, cmd: str,
             conv_keys = True
             conv_keys = True
 
 
         qmp_args = self._qmp_args(conv_keys, args)
         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:
         if cmd == 'quit' and 'error' not in ret and 'return' in ret:
             self._quit_issued = True
             self._quit_issued = True
         return ret
         return ret

+ 2 - 2
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.
         Build a QMP command and send it to the QMP Monitor.
 
 

+ 1 - 1
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) \
     def qmp(self, cmd: str, args: Optional[Dict[str, object]] = None) \
             -> QMPMessage:
             -> QMPMessage:
         assert self._qmp is not None
         assert self._qmp is not None
-        return self._qmp.cmd(cmd, args)
+        return self._qmp.cmd_raw(cmd, args)
 
 
     def get_qmp(self) -> QEMUMonitorProtocol:
     def get_qmp(self) -> QEMUMonitorProtocol:
         assert self._qmp is not None
         assert self._qmp is not None