Re: [PATCH v2 11/25] python: move qmp-shell under the AQMP package
On Wed, Dec 15, 2021 at 02:39:25PM -0500, John Snow wrote: > Signed-off-by: John Snow > --- > python/README.rst | 2 +- > python/qemu/{qmp => aqmp}/qmp_shell.py | 0 > python/setup.cfg | 2 +- > scripts/qmp/qmp-shell | 2 +- > 4 files changed, 3 insertions(+), 3 deletions(-) > rename python/qemu/{qmp => aqmp}/qmp_shell.py (100%) > > 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 > similarity index 100% > rename from python/qemu/qmp/qmp_shell.py > rename to python/qemu/aqmp/qmp_shell.py > diff --git a/python/setup.cfg b/python/setup.cfg > index 78421411d2..168a79c867 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__': Reviewed-by: Beraldo Leal -- Beraldo
Re: [PATCH v2 11/25] python: move qmp-shell under the AQMP package
15.12.2021 22:39, John Snow wrote: Signed-off-by: John Snow Reviewed-by: Vladimir Sementsov-Ogievskiy -- Best regards, Vladimir
[PATCH v2 11/25] python: move qmp-shell under the AQMP package
Signed-off-by: John Snow --- python/README.rst | 2 +- python/qemu/{qmp => aqmp}/qmp_shell.py | 0 python/setup.cfg | 2 +- scripts/qmp/qmp-shell | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename python/qemu/{qmp => aqmp}/qmp_shell.py (100%) 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 similarity index 100% rename from python/qemu/qmp/qmp_shell.py rename to python/qemu/aqmp/qmp_shell.py diff --git a/python/setup.cfg b/python/setup.cfg index 78421411d2..168a79c867 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__': -- 2.31.1