summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Snow2022-01-11 00:28:55 +0100
committerJohn Snow2022-01-21 22:01:31 +0100
commitfd9c3a6219b0470c356c8486188052d353846806 (patch)
treee1894835b1196c405943dd1869d84f4fd213894c
parentpython: move qmp utilities to python/qemu/utils (diff)
downloadqemu-fd9c3a6219b0470c356c8486188052d353846806.tar.gz
qemu-fd9c3a6219b0470c356c8486188052d353846806.tar.xz
qemu-fd9c3a6219b0470c356c8486188052d353846806.zip
python: move qmp-shell under the AQMP package
Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Beraldo Leal <bleal@redhat.com>
-rw-r--r--python/README.rst2
-rw-r--r--python/qemu/aqmp/qmp_shell.py (renamed from python/qemu/qmp/qmp_shell.py)0
-rw-r--r--python/setup.cfg2
-rwxr-xr-xscripts/qmp/qmp-shell2
4 files changed, 3 insertions, 3 deletions
diff --git a/python/README.rst b/python/README.rst
index 9c1fceaee7..fcf74f69ea 100644
--- a/python/README.rst
+++ b/python/README.rst
@@ -59,7 +59,7 @@ Package installation also normally provides executable console scripts,
so that tools like ``qmp-shell`` are always available via $PATH. To
invoke them without installation, you can invoke e.g.:
-``> PYTHONPATH=~/src/qemu/python python3 -m qemu.qmp.qmp_shell``
+``> PYTHONPATH=~/src/qemu/python python3 -m qemu.aqmp.qmp_shell``
The mappings between console script name and python module path can be
found in ``setup.cfg``.
diff --git a/python/qemu/qmp/qmp_shell.py b/python/qemu/aqmp/qmp_shell.py
index d11bf54b00..d11bf54b00 100644
--- a/python/qemu/qmp/qmp_shell.py
+++ b/python/qemu/aqmp/qmp_shell.py
diff --git a/python/setup.cfg b/python/setup.cfg
index 04a41ef1a0..3fb18f845d 100644
--- a/python/setup.cfg
+++ b/python/setup.cfg
@@ -67,7 +67,7 @@ console_scripts =
qom-tree = qemu.utils.qom:QOMTree.entry_point
qom-fuse = qemu.utils.qom_fuse:QOMFuse.entry_point [fuse]
qemu-ga-client = qemu.utils.qemu_ga_client:main
- qmp-shell = qemu.qmp.qmp_shell:main
+ qmp-shell = qemu.aqmp.qmp_shell:main
aqmp-tui = qemu.aqmp.aqmp_tui:main [tui]
[flake8]
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
index 4a20f97db7..31b19d73e2 100755
--- a/scripts/qmp/qmp-shell
+++ b/scripts/qmp/qmp-shell
@@ -4,7 +4,7 @@ import os
import sys
sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
-from qemu.qmp import qmp_shell
+from qemu.aqmp import qmp_shell
if __name__ == '__main__':