From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Christian Borntraeger" <borntraeger@linux.ibm.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
qemu-arm@nongnu.org,
"Vladimir Sementsov-Ogievskiy" <v.sementsov-og@mail.ru>,
"Ani Sinha" <anisinha@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
qemu-s390x@nongnu.org, "Peter Xu" <peterx@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Markus Armbruster" <armbru@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
"John Snow" <jsnow@redhat.com>, "Eric Blake" <eblake@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Fabiano Rosas" <farosas@suse.de>,
qemu-block@nongnu.org, "Eduardo Habkost" <eduardo@habkost.net>,
"Juan Quintela" <quintela@redhat.com>,
"Leonardo Bras" <leobras@redhat.com>,
"Joel Stanley" <joel@jms.id.au>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Andrew Jeffery" <andrew@aj.id.au>,
"Cédric Le Goater" <clg@kaod.org>,
"Eric Farman" <farman@linux.ibm.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Cleber Rosa" <crosa@redhat.com>
Subject: [PULL 14/25] python: rename QEMUMonitorProtocol.cmd() to cmd_raw()
Date: Fri, 13 Oct 2023 15:09:29 -0400 [thread overview]
Message-ID: <20231013190941.3699288-15-jsnow@redhat.com> (raw)
In-Reply-To: <20231013190941.3699288-1-jsnow@redhat.com>
From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
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>
---
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 d539e91268..50bba33729 100644
--- a/python/qemu/machine/machine.py
+++ b/python/qemu/machine/machine.py
@@ -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
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 145c682713..0c061d8986 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.41.0
next prev parent reply other threads:[~2023-10-13 19:16 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-13 19:09 [PULL 00/25] Python patches John Snow
2023-10-13 19:09 ` [PULL 01/25] python/machine: move socket setup out of _base_args property John Snow
2023-10-13 19:09 ` [PULL 02/25] python/machine: close sock_pair in cleanup path John Snow
2023-10-13 19:09 ` [PULL 03/25] python/console_socket: accept existing FD in initializer John Snow
2023-10-13 19:09 ` [PULL 04/25] python/machine: use socketpair() for console connections John Snow
2023-10-13 19:09 ` [PULL 05/25] python/machine: use socketpair() for qtest connection John Snow
2023-10-13 19:09 ` [PULL 06/25] python/machine: remove unused sock_dir argument John Snow
2023-10-13 19:09 ` [PULL 07/25] Python/iotests: Add type hint for nbd module John Snow
2023-10-13 19:09 ` [PULL 08/25] python/qmp: remove Server.wait_closed() call for Python 3.12 John Snow
2023-10-13 19:09 ` [PULL 09/25] configure: fix error message to say Python 3.8 John Snow
2023-10-13 19:09 ` [PULL 10/25] Python: Enable python3.12 support John Snow
2023-10-13 19:09 ` [PULL 11/25] python/qemu/qmp/legacy: cmd(): drop cmd_id unused argument John Snow
2023-10-13 19:09 ` [PULL 12/25] qmp_shell.py: _fill_completion() use .command() instead of .cmd() John Snow
2023-10-13 19:09 ` [PULL 13/25] scripts/cpu-x86-uarch-abi.py: " John Snow
2023-10-13 19:09 ` John Snow [this message]
2023-10-13 19:09 ` [PULL 15/25] python/qemu: rename command() to cmd() John Snow
2023-10-13 19:09 ` [PULL 16/25] python/machine.py: upgrade vm.cmd() method John Snow
2023-10-13 19:09 ` [PULL 17/25] iotests: QemuStorageDaemon: add cmd() method like in QEMUMachine John Snow
2023-10-13 19:09 ` [PULL 18/25] iotests: add some missed checks of qmp result John Snow
2023-10-13 19:09 ` [PULL 19/25] iotests: refactor some common qmp result checks into generic pattern John Snow
2023-10-13 19:09 ` [PULL 20/25] iotests: drop some extra semicolons John Snow
2023-10-13 19:09 ` [PULL 21/25] iotests: drop some extra ** in qmp() call John Snow
2023-10-13 19:09 ` [PULL 22/25] iotests.py: pause_job(): drop return value John Snow
2023-10-13 19:09 ` [PULL 23/25] tests/vm/basevm.py: use cmd() instead of qmp() John Snow
2023-10-13 19:09 ` [PULL 24/25] scripts: add python_qmp_updater.py John Snow
2023-10-13 19:09 ` [PULL 25/25] python: use vm.cmd() instead of vm.qmp() where appropriate John Snow
2023-10-16 19:21 ` [PULL 00/25] Python patches Stefan Hajnoczi
2023-10-16 23:44 ` John Snow
2023-10-17 11:06 ` Vladimir Sementsov-Ogievskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231013190941.3699288-15-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=andrew@aj.id.au \
--cc=anisinha@redhat.com \
--cc=armbru@redhat.com \
--cc=aurelien@aurel32.net \
--cc=bleal@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=clg@kaod.org \
--cc=crosa@redhat.com \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=farman@linux.ibm.com \
--cc=farosas@suse.de \
--cc=hreitz@redhat.com \
--cc=joel@jms.id.au \
--cc=kwolf@redhat.com \
--cc=leobras@redhat.com \
--cc=mst@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=quintela@redhat.com \
--cc=thuth@redhat.com \
--cc=v.sementsov-og@mail.ru \
--cc=vsementsov@yandex-team.ru \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).