Skip to content

Commit

Permalink
python: rename QEMUMonitorProtocol.cmd() to cmd_raw()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vladimir Sementsov-Ogievskiy authored and jnsnow committed Oct 12, 2023
1 parent 7f521b0 commit 3727470
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion python/qemu/machine/machine.py
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,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
Expand Down
4 changes: 2 additions & 2 deletions python/qemu/qmp/legacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tests/qemu-iotests/iotests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3727470

Please sign in to comment.