Skip to content

Python: delete synchronous qemu.qmp package

John Snow qemu-devel 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest31 patches 14 repliesIn review
  2. v225 patches 61 repliesSuperseded
  3. v123 patches 0 repliesSuperseded

Changes in v3 from the cover letter

- Rebased on top of jsnow/python (For GitLab CI fixes)
- Added a new patch 001 to fix a typo Vladimir found.
- Tiny change in 006 due to the new patch 001
- Reworded subject of patch 007
- Changed import statement in patch 013 (Vladimir)
- Rebase-related changes in patch 021
- Removed 'aqmp' from internal variable names in 026
- Added new patch to rename aqmp-tui to qmp-tui in 027

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/31python/aqmp: use absolute import statementpython/qemu/aqmp/aqmp_tui.py+2 -10 replies
2/31Python/aqmp: fix type definitions for mypy 0.920python/qemu/aqmp/protocol.py+3 -20 replies
3/31python: update type hints for mypy 0.930python/qemu/qmp/qom_common.py+1 -50 replies
4/31simplebench: Fix Python syntax error (reported by LGTM)scripts/simplebench/bench-example.py+1 -10 replies
5/31python/aqmp: fix docstring typopython/qemu/aqmp/__init__.py+1 -11 reply
6/31python/aqmp: add __del__ method to legacy interfacepython/qemu/aqmp/legacy.py+18 -00 replies
7/31python/aqmp: handle asyncio.TimeoutError on execute()python/qemu/aqmp/qmp_client.py+6 -20 replies
8/31python/aqmp: copy type definitions from qmppython/qemu/aqmp/legacy.py python/qemu/aqmp/protocol.py+30 -81 reply
9/31python/aqmp: add SocketAddrT to package rootpython/qemu/aqmp/__init__.py+9 -10 replies
10/31python/aqmp: rename AQMPError to QMPErrorpython/qemu/aqmp/__init__.py python/qemu/aqmp/error.py python/qemu/aqmp/events.py +3 more+21 -211 reply
11/31python/qemu-ga-client: don't use deprecated CLI syntax in usage commentpython/qemu/qmp/qemu_ga_client.py+1 -10 replies
12/31python/qmp: switch qemu-ga-client to AQMPpython/qemu/qmp/qemu_ga_client.py+11 -110 replies
13/31python/qmp: switch qom tools to AQMPpython/qemu/qmp/qom.py python/qemu/qmp/qom_common.py python/qemu/qmp/qom_fuse.py+11 -80 replies
14/31python/qmp: switch qmp-shell to AQMPpython/qemu/aqmp/legacy.py python/qemu/qmp/qmp_shell.py+20 -142 replies
15/31python: move qmp utilities to python/qemu/utilspython/qemu/utils/qemu_ga_client.py python/qemu/utils/qom.py python/qemu/utils/qom_common.py +8 more+14 -141 reply
16/31python: move qmp-shell under the AQMP packagepython/README.rst python/qemu/aqmp/qmp_shell.py python/setup.cfg +1 more+3 -31 reply
17/31python/machine: permanently switch to AQMPpython/qemu/machine/machine.py python/qemu/machine/qtest.py+8 -120 replies
18/31scripts/cpu-x86-uarch-abi: fix CLI parsingscripts/cpu-x86-uarch-abi.py+1 -20 replies
19/31scripts/cpu-x86-uarch-abi: switch to AQMPscripts/cpu-x86-uarch-abi.py+2 -20 replies
20/31scripts/render-block-graph: switch to AQMPscripts/render_block_graph.py+3 -50 replies
21/31scripts/bench-block-job: switch to AQMPscripts/simplebench/bench_block_job.py+1 -20 replies
22/31iotests/mirror-top-perms: switch to AQMPtests/qemu-iotests/tests/mirror-top-perms+3 -40 replies
23/31iotests: switch to AQMPtests/qemu-iotests/iotests.py+1 -12 replies
24/31python: temporarily silence pylint duplicate-code warningspython/setup.cfg+1 -00 replies
25/31python/aqmp: take QMPBadPortError and parse_address from qemu.qmppython/qemu/aqmp/aqmp_tui.py python/qemu/aqmp/legacy.py python/qemu/qmp/__init__.py+27 -320 replies
26/31python/aqmp: fully separate from qmp.QEMUMonitorProtocolpython/qemu/aqmp/legacy.py+32 -60 replies
27/31python/aqmp: copy qmp docstrings to qemu.aqmp.legacypython/qemu/aqmp/legacy.py+102 -80 replies
28/31python: remove the old QMP packagepython/PACKAGE.rst python/README.rst python/qemu/qmp/README.rst +3 more+4 -4100 replies
29/31python: re-enable pylint duplicate-code warningspython/setup.cfg+0 -10 replies
30/31python: rename qemu.aqmp to qemu.qmppython/PACKAGE.rst python/README.rst python/qemu/machine/machine.py +26 more+69 -691 reply
31/31python: rename 'aqmp-tui' to 'qmp-tui'python/qemu/qmp/qmp_tui.py python/setup.cfg+9 -91 reply

Reviews trailers per patch

28 of 31 patches have a Reviewed-by or Acked-by.

PatchVladimir Sementsov-OgievskiyBeraldo LealDaniel P. BerrangéPhilippe Mathieu-DaudéJohn Snow
1/31
2/31
3/31
4/31R-b R-b
5/31R-b
6/31R-b R-b
7/31R-b R-b
8/31R-b R-b
9/31R-b R-b
10/31R-b
11/31R-b R-b
12/31R-b R-b
13/31R-b R-b
14/31R-b
15/31R-b R-b
16/31R-b R-b R-b
17/31R-b R-b
18/31R-b R-b
19/31R-b R-b R-b
20/31R-b R-b
21/31R-b R-b
22/31R-b R-b
23/31R-b R-b
24/31R-b
25/31R-b R-b
26/31R-b R-b
27/31R-b R-b
28/31R-b R-b
29/31R-b R-b
30/31R-b
31/31R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v3 thread

Cover letter [PATCH v3 00/31] Python: delete synchronous qemu.qmp package

Based-on: <[email protected]>
(jsnow/python staging branch)
GitLab: https://gitlab.com/jsnow/qemu/-/commits/python-qmp-legacy-switch
CI: https://gitlab.com/jsnow/qemu/-/pipelines/445163212

Hi, this series is part of an effort to publish the qemu.qmp package on PyPI. It is the first of three series to complete this work:

--> (1) Switch the new Async QMP library in to python/qemu/qmp
(2) Fork python/qemu/qmp out into its own repository, with updated GitLab CI/CD targets to build packages.
(3) Update qemu.git to install qemu.qmp from PyPI, and then delete python/qemu/qmp.

This series swaps out qemu.qmp for qemu.aqmp permanently, instead of hiding it behind an environment variable toggle. This leaves us with just one QMP library to worry about. It also implements the rename of "qemu.aqmp" to "qemu.qmp".

I suspect the most potential disruption to iotest and avocado maintainers, as those two subsystems rely on the QMP features the most. Would appreciate at least an ACK from each of those camps if you're willing to give benefit-of-the-doubt on the actual Python code.

V3:
- Rebased on top of jsnow/python (For GitLab CI fixes)
- Added a new patch 001 to fix a typo Vladimir found.
- Tiny change in 006 due to the new patch 001
- Reworded subject of patch 007
- Changed import statement in patch 013 (Vladimir)
- Rebase-related changes in patch 021
- Removed 'aqmp' from internal variable names in 026
- Added new patch to rename aqmp-tui to qmp-tui in 027

V2:
- Integrate the renaming of qemu.aqmp to qemu.qmp in this series
- Minor bits and pieces.

John Snow (30):
python/aqmp: use absolute import statement Python/aqmp: fix type definitions for mypy 0.920
python: update type hints for mypy 0.930
python/aqmp: fix docstring typo
python/aqmp: add __del__ method to legacy interface python/aqmp: handle asyncio.TimeoutError on execute() python/aqmp: copy type definitions from qmp python/aqmp: add SocketAddrT to package root python/aqmp: rename AQMPError to QMPError python/qemu-ga-client: don't use deprecated CLI syntax in usage
comment
python/qmp: switch qemu-ga-client to AQMP
python/qmp: switch qom tools to AQMP
python/qmp: switch qmp-shell to AQMP
python: move qmp utilities to python/qemu/utils
python: move qmp-shell under the AQMP package python/machine: permanently switch to AQMP scripts/cpu-x86-uarch-abi: fix CLI parsing scripts/cpu-x86-uarch-abi: switch to AQMP scripts/render-block-graph: switch to AQMP scripts/bench-block-job: switch to AQMP iotests/mirror-top-perms: switch to AQMP
iotests: switch to AQMP
python: temporarily silence pylint duplicate-code warnings python/aqmp: take QMPBadPortError and parse_address from qemu.qmp python/aqmp: fully separate from qmp.QEMUMonitorProtocol python/aqmp: copy qmp docstrings to qemu.aqmp.legacy
python: remove the old QMP package
python: re-enable pylint duplicate-code warnings
python: rename qemu.aqmp to qemu.qmp
python: rename 'aqmp-tui' to 'qmp-tui'

Stefan Weil (1):
simplebench: Fix Python syntax error (reported by LGTM)

 python/qemu/qmp/README.rst                    |   9 -
 python/qemu/aqmp/__init__.py                  |  51 --
 python/qemu/aqmp/legacy.py                    | 138 ------
 python/qemu/aqmp/py.typed                     |   0
 python/qemu/machine/machine.py                |  18 +-
 python/qemu/machine/qtest.py                  |   2 +-
 python/qemu/qmp/__init__.py                   | 441 ++----------------
 python/qemu/{aqmp => qmp}/error.py            |  12 +-
 python/qemu/{aqmp => qmp}/events.py           |   6 +-
 python/qemu/qmp/legacy.py                     | 319 +++++++++++++
 python/qemu/{aqmp => qmp}/message.py          |   0
 python/qemu/{aqmp => qmp}/models.py           |   0
 python/qemu/{aqmp => qmp}/protocol.py         |  33 +-
 python/qemu/{aqmp => qmp}/qmp_client.py       |  32 +-
 python/qemu/qmp/qmp_shell.py                  |  31 +-
 .../qemu/{aqmp/aqmp_tui.py => qmp/qmp_tui.py} |  14 +-
 python/qemu/{aqmp => qmp}/util.py             |   0
 python/qemu/{qmp => utils}/qemu_ga_client.py  |  24 +-
 python/qemu/{qmp => utils}/qom.py             |   5 +-
 python/qemu/{qmp => utils}/qom_common.py      |   9 +-
 python/qemu/{qmp => utils}/qom_fuse.py        |  11 +-
 python/setup.cfg                              |  23 +-
 python/tests/protocol.py                      |  14 +-
 scripts/cpu-x86-uarch-abi.py                  |   7 +-
 scripts/device-crash-test                     |   4 +-
 scripts/qmp/qemu-ga-client                    |   2 +-
 scripts/qmp/qom-fuse                          |   2 +-
 scripts/qmp/qom-get                           |   2 +-
 scripts/qmp/qom-list                          |   2 +-
 scripts/qmp/qom-set                           |   2 +-
 scripts/qmp/qom-tree                          |   2 +-
 scripts/render_block_graph.py                 |   8 +-
 scripts/simplebench/bench-example.py          |   2 +-
 scripts/simplebench/bench_block_job.py        |   5 +-
 tests/qemu-iotests/iotests.py                 |   2 +-
 tests/qemu-iotests/tests/mirror-top-perms     |  13 +-
 36 files changed, 502 insertions(+), 743 deletions(-)
 delete mode 100644 python/qemu/qmp/README.rst
 delete mode 100644 python/qemu/aqmp/__init__.py
 delete mode 100644 python/qemu/aqmp/legacy.py
 delete mode 100644 python/qemu/aqmp/py.typed
 rename python/qemu/{aqmp => qmp}/error.py (87%)
 rename python/qemu/{aqmp => qmp}/events.py (99%)
 create mode 100644 python/qemu/qmp/legacy.py
 rename python/qemu/{aqmp => qmp}/message.py (100%)
 rename python/qemu/{aqmp => qmp}/models.py (100%)
 rename python/qemu/{aqmp => qmp}/protocol.py (97%)
 rename python/qemu/{aqmp => qmp}/qmp_client.py (96%)
 rename python/qemu/{aqmp/aqmp_tui.py => qmp/qmp_tui.py} (98%)
 rename python/qemu/{aqmp => qmp}/util.py (100%)
 rename python/qemu/{qmp => utils}/qemu_ga_client.py (94%)
 rename python/qemu/{qmp => utils}/qom.py (99%)
 rename python/qemu/{qmp => utils}/qom_common.py (95%)
 rename python/qemu/{qmp => utils}/qom_fuse.py (97%)
Signature · 1 line
2.31.1