Re: [PATCH v3 30/31] python: rename qemu.aqmp to qemu.qmp

[Beraldo Leal <bleal@redhat.com>]

On Mon, Jan 10, 2022 at 06:29:09PM -0500, John Snow wrote:
> Now that we are fully switched over to the new QMP library, move it back
> over the old namespace. This is being done primarily so that we may
> upload this package simply as "qemu.qmp" without introducing confusion
> over whether or not "aqmp" is a new protocol or not.
> 
> The trade-off is increased confusion inside the QEMU developer
> tree. Sorry!
> 
> Note: the 'private' member "_aqmp" in legacy.py also changes to "_qmp";
> not out of necessity, but just to remove any traces of the "aqmp"
> name.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  python/PACKAGE.rst                        |  4 +--
>  python/README.rst                         |  4 +--
>  python/qemu/machine/machine.py            |  4 +--
>  python/qemu/machine/qtest.py              |  2 +-
>  python/qemu/{aqmp => qmp}/__init__.py     |  6 ++--
>  python/qemu/{aqmp => qmp}/aqmp_tui.py     |  0
>  python/qemu/{aqmp => qmp}/error.py        |  0
>  python/qemu/{aqmp => qmp}/events.py       |  2 +-
>  python/qemu/{aqmp => qmp}/legacy.py       | 36 +++++++++++------------
>  python/qemu/{aqmp => qmp}/message.py      |  0
>  python/qemu/{aqmp => qmp}/models.py       |  0
>  python/qemu/{aqmp => qmp}/protocol.py     |  4 +--
>  python/qemu/{aqmp => qmp}/py.typed        |  0
>  python/qemu/{aqmp => qmp}/qmp_client.py   | 16 +++++-----
>  python/qemu/{aqmp => qmp}/qmp_shell.py    |  4 +--
>  python/qemu/{aqmp => qmp}/util.py         |  0
>  python/qemu/utils/qemu_ga_client.py       |  4 +--
>  python/qemu/utils/qom.py                  |  2 +-
>  python/qemu/utils/qom_common.py           |  4 +--
>  python/qemu/utils/qom_fuse.py             |  2 +-
>  python/setup.cfg                          |  8 ++---
>  python/tests/protocol.py                  | 14 ++++-----
>  scripts/cpu-x86-uarch-abi.py              |  2 +-
>  scripts/device-crash-test                 |  4 +--
>  scripts/qmp/qmp-shell                     |  2 +-
>  scripts/render_block_graph.py             |  4 +--
>  scripts/simplebench/bench_block_job.py    |  2 +-
>  tests/qemu-iotests/iotests.py             |  2 +-
>  tests/qemu-iotests/tests/mirror-top-perms |  6 ++--
>  29 files changed, 69 insertions(+), 69 deletions(-)
>  rename python/qemu/{aqmp => qmp}/__init__.py (87%)
>  rename python/qemu/{aqmp => qmp}/aqmp_tui.py (100%)
>  rename python/qemu/{aqmp => qmp}/error.py (100%)
>  rename python/qemu/{aqmp => qmp}/events.py (99%)
>  rename python/qemu/{aqmp => qmp}/legacy.py (92%)
>  rename python/qemu/{aqmp => qmp}/message.py (100%)
>  rename python/qemu/{aqmp => qmp}/models.py (100%)
>  rename python/qemu/{aqmp => qmp}/protocol.py (99%)
>  rename python/qemu/{aqmp => qmp}/py.typed (100%)
>  rename python/qemu/{aqmp => qmp}/qmp_client.py (97%)
>  rename python/qemu/{aqmp => qmp}/qmp_shell.py (99%)
>  rename python/qemu/{aqmp => qmp}/util.py (100%)
> 
> diff --git a/python/PACKAGE.rst b/python/PACKAGE.rst
> index ddfa9ba3f5..b0b86cc4c3 100644
> --- a/python/PACKAGE.rst
> +++ b/python/PACKAGE.rst
> @@ -8,11 +8,11 @@ to change at any time.
>  Usage
>  -----
>  
> -The ``qemu.aqmp`` subpackage provides a library for communicating with
> +The ``qemu.qmp`` subpackage provides a library for communicating with
>  QMP servers. The ``qemu.machine`` subpackage offers rudimentary
>  facilities for launching and managing QEMU processes. Refer to each
>  package's documentation
> -(``>>> help(qemu.aqmp)``, ``>>> help(qemu.machine)``)
> +(``>>> help(qemu.qmp)``, ``>>> help(qemu.machine)``)
>  for more information.
>  
>  Contributing
> diff --git a/python/README.rst b/python/README.rst
> index eb5213337d..9c1fceaee7 100644
> --- a/python/README.rst
> +++ b/python/README.rst
> @@ -3,7 +3,7 @@ QEMU Python Tooling
>  
>  This directory houses Python tooling used by the QEMU project to build,
>  configure, and test QEMU. It is organized by namespace (``qemu``), and
> -then by package (e.g. ``qemu/machine``, ``qemu/aqmp``, etc).
> +then by package (e.g. ``qemu/machine``, ``qemu/qmp``, etc).
>  
>  ``setup.py`` is used by ``pip`` to install this tooling to the current
>  environment. ``setup.cfg`` provides the packaging configuration used by
> @@ -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.aqmp.qmp_shell``
> +``> PYTHONPATH=~/src/qemu/python python3 -m qemu.qmp.qmp_shell``
>  
>  The mappings between console script name and python module path can be
>  found in ``setup.cfg``.
> diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
> index 21fb4a4f30..6e4bf6520c 100644
> --- a/python/qemu/machine/machine.py
> +++ b/python/qemu/machine/machine.py
> @@ -40,8 +40,8 @@
>      TypeVar,
>  )
>  
> -from qemu.aqmp import SocketAddrT
> -from qemu.aqmp.legacy import (
> +from qemu.qmp import SocketAddrT
> +from qemu.qmp.legacy import (
>      QEMUMonitorProtocol,
>      QMPMessage,
>      QMPReturnValue,
> diff --git a/python/qemu/machine/qtest.py b/python/qemu/machine/qtest.py
> index 13e0aaff84..1a1fc6c9b0 100644
> --- a/python/qemu/machine/qtest.py
> +++ b/python/qemu/machine/qtest.py
> @@ -26,7 +26,7 @@
>      TextIO,
>  )
>  
> -from qemu.aqmp import SocketAddrT
> +from qemu.qmp import SocketAddrT
>  
>  from .machine import QEMUMachine
>  
> diff --git a/python/qemu/aqmp/__init__.py b/python/qemu/qmp/__init__.py
> similarity index 87%
> rename from python/qemu/aqmp/__init__.py
> rename to python/qemu/qmp/__init__.py
> index 4c22c38079..a19868b13d 100644
> --- a/python/qemu/aqmp/__init__.py
> +++ b/python/qemu/qmp/__init__.py
> @@ -6,8 +6,8 @@
>  QEMU Guest Agent, and the QEMU Storage Daemon.
>  
>  `QMPClient` provides the main functionality of this package. All errors
> -raised by this library derive from `QMPError`, see `aqmp.error` for
> -additional detail. See `aqmp.events` for an in-depth tutorial on
> +raised by this library derive from `QMPError`, see `qmp.error` for
> +additional detail. See `qmp.events` for an in-depth tutorial on
>  managing QMP events.
>  """
>  
> @@ -36,7 +36,7 @@
>  
>  
>  # Suppress logging unless an application engages it.
> -logging.getLogger('qemu.aqmp').addHandler(logging.NullHandler())
> +logging.getLogger('qemu.qmp').addHandler(logging.NullHandler())
>  
>  
>  # The order of these fields impact the Sphinx documentation order.
> diff --git a/python/qemu/aqmp/aqmp_tui.py b/python/qemu/qmp/aqmp_tui.py
> similarity index 100%
> rename from python/qemu/aqmp/aqmp_tui.py
> rename to python/qemu/qmp/aqmp_tui.py
> diff --git a/python/qemu/aqmp/error.py b/python/qemu/qmp/error.py
> similarity index 100%
> rename from python/qemu/aqmp/error.py
> rename to python/qemu/qmp/error.py
> diff --git a/python/qemu/aqmp/events.py b/python/qemu/qmp/events.py
> similarity index 99%
> rename from python/qemu/aqmp/events.py
> rename to python/qemu/qmp/events.py
> index f3d4e2b5e8..6199776cc6 100644
> --- a/python/qemu/aqmp/events.py
> +++ b/python/qemu/qmp/events.py
> @@ -1,5 +1,5 @@
>  """
> -AQMP Events and EventListeners
> +QMP Events and EventListeners
>  
>  Asynchronous QMP uses `EventListener` objects to listen for events. An
>  `EventListener` is a FIFO event queue that can be pre-filtered to listen
> diff --git a/python/qemu/aqmp/legacy.py b/python/qemu/qmp/legacy.py
> similarity index 92%
> rename from python/qemu/aqmp/legacy.py
> rename to python/qemu/qmp/legacy.py
> index 6c250cd46a..1c03c8b22e 100644
> --- a/python/qemu/aqmp/legacy.py
> +++ b/python/qemu/qmp/legacy.py
> @@ -80,7 +80,7 @@ def __init__(self, address: SocketAddrT,
>                   nickname: Optional[str] = None):
>  
>          # pylint: disable=super-init-not-called
> -        self._aqmp = QMPClient(nickname)
> +        self._qmp = QMPClient(nickname)
>          self._aloop = asyncio.get_event_loop()
>          self._address = address
>          self._timeout: Optional[float] = None
> @@ -95,9 +95,9 @@ def _sync(
>          )
>  
>      def _get_greeting(self) -> Optional[QMPMessage]:
> -        if self._aqmp.greeting is not None:
> +        if self._qmp.greeting is not None:
>              # pylint: disable=protected-access
> -            return self._aqmp.greeting._asdict()
> +            return self._qmp.greeting._asdict()
>          return None
>  
>      def __enter__(self: _T) -> _T:
> @@ -140,11 +140,11 @@ def connect(self, negotiate: bool = True) -> Optional[QMPMessage]:
>          :return: QMP greeting dict, or None if negotiate is false
>          :raise ConnectError: on connection errors
>          """
> -        self._aqmp.await_greeting = negotiate
> -        self._aqmp.negotiate = negotiate
> +        self._qmp.await_greeting = negotiate
> +        self._qmp.negotiate = negotiate
>  
>          self._sync(
> -            self._aqmp.connect(self._address)
> +            self._qmp.connect(self._address)
>          )
>          return self._get_greeting()
>  
> @@ -159,11 +159,11 @@ def accept(self, timeout: Optional[float] = 15.0) -> QMPMessage:
>          :return: QMP greeting dict
>          :raise ConnectError: on connection errors
>          """
> -        self._aqmp.await_greeting = True
> -        self._aqmp.negotiate = True
> +        self._qmp.await_greeting = True
> +        self._qmp.negotiate = True
>  
>          self._sync(
> -            self._aqmp.accept(self._address),
> +            self._qmp.accept(self._address),
>              timeout
>          )
>  
> @@ -185,7 +185,7 @@ def cmd_obj(self, qmp_cmd: QMPMessage) -> QMPMessage:
>                  # _raw() isn't a public API, because turning off
>                  # automatic ID assignment is discouraged. For
>                  # compatibility with iotests *only*, do it anyway.
> -                self._aqmp._raw(qmp_cmd, assign_id=False),
> +                self._qmp._raw(qmp_cmd, assign_id=False),
>                  self._timeout
>              )
>          )
> @@ -212,7 +212,7 @@ def command(self, cmd: str, **kwds: object) -> QMPReturnValue:
>          Build and send a QMP command to the monitor, report errors if any
>          """
>          return self._sync(
> -            self._aqmp.execute(cmd, kwds),
> +            self._qmp.execute(cmd, kwds),
>              self._timeout
>          )
>  
> @@ -233,7 +233,7 @@ def pull_event(self,
>          """
>          if not wait:
>              # wait is False/0: "do not wait, do not except."
> -            if self._aqmp.events.empty():
> +            if self._qmp.events.empty():
>                  return None
>  
>          # If wait is 'True', wait forever. If wait is False/0, the events
> @@ -245,7 +245,7 @@ def pull_event(self,
>  
>          return dict(
>              self._sync(
> -                self._aqmp.events.get(),
> +                self._qmp.events.get(),
>                  timeout
>              )
>          )
> @@ -265,7 +265,7 @@ def get_events(self, wait: Union[bool, float] = False) -> List[QMPMessage]:
>  
>          :return: A list of QMP events.
>          """
> -        events = [dict(x) for x in self._aqmp.events.clear()]
> +        events = [dict(x) for x in self._qmp.events.clear()]
>          if events:
>              return events
>  
> @@ -274,12 +274,12 @@ def get_events(self, wait: Union[bool, float] = False) -> List[QMPMessage]:
>  
>      def clear_events(self) -> None:
>          """Clear current list of pending events."""
> -        self._aqmp.events.clear()
> +        self._qmp.events.clear()
>  
>      def close(self) -> None:
>          """Close the connection."""
>          self._sync(
> -            self._aqmp.disconnect()
> +            self._qmp.disconnect()
>          )
>  
>      def settimeout(self, timeout: Optional[float]) -> None:
> @@ -300,10 +300,10 @@ def send_fd_scm(self, fd: int) -> None:
>          """
>          Send a file descriptor to the remote via SCM_RIGHTS.
>          """
> -        self._aqmp.send_fd_scm(fd)
> +        self._qmp.send_fd_scm(fd)
>  
>      def __del__(self) -> None:
> -        if self._aqmp.runstate == Runstate.IDLE:
> +        if self._qmp.runstate == Runstate.IDLE:
>              return
>  
>          if not self._aloop.is_running():
> diff --git a/python/qemu/aqmp/message.py b/python/qemu/qmp/message.py
> similarity index 100%
> rename from python/qemu/aqmp/message.py
> rename to python/qemu/qmp/message.py
> diff --git a/python/qemu/aqmp/models.py b/python/qemu/qmp/models.py
> similarity index 100%
> rename from python/qemu/aqmp/models.py
> rename to python/qemu/qmp/models.py
> diff --git a/python/qemu/aqmp/protocol.py b/python/qemu/qmp/protocol.py
> similarity index 99%
> rename from python/qemu/aqmp/protocol.py
> rename to python/qemu/qmp/protocol.py
> index 50e973c2f2..3bae528d59 100644
> --- a/python/qemu/aqmp/protocol.py
> +++ b/python/qemu/qmp/protocol.py
> @@ -193,9 +193,9 @@ class AsyncProtocol(Generic[T]):
>  
>      :param name:
>          Name used for logging messages, if any. By default, messages
> -        will log to 'qemu.aqmp.protocol', but each individual connection
> +        will log to 'qemu.qmp.protocol', but each individual connection
>          can be given its own logger by giving it a name; messages will
> -        then log to 'qemu.aqmp.protocol.${name}'.
> +        then log to 'qemu.qmp.protocol.${name}'.
>      """
>      # pylint: disable=too-many-instance-attributes
>  
> diff --git a/python/qemu/aqmp/py.typed b/python/qemu/qmp/py.typed
> similarity index 100%
> rename from python/qemu/aqmp/py.typed
> rename to python/qemu/qmp/py.typed
> diff --git a/python/qemu/aqmp/qmp_client.py b/python/qemu/qmp/qmp_client.py
> similarity index 97%
> rename from python/qemu/aqmp/qmp_client.py
> rename to python/qemu/qmp/qmp_client.py
> index f1a845cc82..8ea9e45115 100644
> --- a/python/qemu/aqmp/qmp_client.py
> +++ b/python/qemu/qmp/qmp_client.py
> @@ -192,7 +192,7 @@ async def run(self, address='/tmp/qemu.socket'):
>                await self.qmp.runstate_changed.wait()
>                await self.disconnect()
>  
> -    See `aqmp.events` for more detail on event handling patterns.
> +    See `qmp.events` for more detail on event handling patterns.
>      """
>      #: Logger object used for debugging messages.
>      logger = logging.getLogger(__name__)
> @@ -416,7 +416,7 @@ def _do_send(self, msg: Message) -> None:
>  
>      @upper_half
>      def _get_exec_id(self) -> str:
> -        exec_id = f"__aqmp#{self._execute_id:05d}"
> +        exec_id = f"__qmp#{self._execute_id:05d}"
>          self._execute_id += 1
>          return exec_id
>  
> @@ -476,7 +476,7 @@ async def _execute(self, msg: Message, assign_id: bool = True) -> Message:
>          An execution ID will be assigned if assign_id is `True`. It can be
>          disabled, but this requires that an ID is manually assigned
>          instead. For manually assigned IDs, you must not use the string
> -        '__aqmp#' anywhere in the ID.
> +        '__qmp#' anywhere in the ID.
>  
>          :param msg: The QMP `Message` to execute.
>          :param assign_id: If True, assign a new execution ID.
> @@ -490,7 +490,7 @@ async def _execute(self, msg: Message, assign_id: bool = True) -> Message:
>              msg['id'] = self._get_exec_id()
>          elif 'id' in msg:
>              assert isinstance(msg['id'], str)
> -            assert '__aqmp#' not in msg['id']
> +            assert '__qmp#' not in msg['id']
>  
>          exec_id = await self._issue(msg)
>          return await self._reply(exec_id)
> @@ -512,7 +512,7 @@ async def _raw(
>              Assign an arbitrary execution ID to this message. If
>              `False`, the existing id must either be absent (and no other
>              such pending execution may omit an ID) or a string. If it is
> -            a string, it must not start with '__aqmp#' and no other such
> +            a string, it must not start with '__qmp#' and no other such
>              pending execution may currently be using that ID.
>  
>          :return: Execution reply from the server.
> @@ -524,7 +524,7 @@ async def _raw(
>              When assign_id is `False`, an ID is given, and it is not a string.
>          :raise ValueError:
>              When assign_id is `False`, but the ID is not usable;
> -            Either because it starts with '__aqmp#' or it is already in-use.
> +            Either because it starts with '__qmp#' or it is already in-use.
>          """
>          # 1. convert generic Mapping or bytes to a QMP Message
>          # 2. copy Message objects so that we assign an ID only to the copy.
> @@ -534,9 +534,9 @@ async def _raw(
>          if not assign_id and 'id' in msg:
>              if not isinstance(exec_id, str):
>                  raise TypeError(f"ID ('{exec_id}') must be a string.")
> -            if exec_id.startswith('__aqmp#'):
> +            if exec_id.startswith('__qmp#'):
>                  raise ValueError(
> -                    f"ID ('{exec_id}') must not start with '__aqmp#'."
> +                    f"ID ('{exec_id}') must not start with '__qmp#'."
>                  )
>  
>          if not assign_id and exec_id in self._pending:
> diff --git a/python/qemu/aqmp/qmp_shell.py b/python/qemu/qmp/qmp_shell.py
> similarity index 99%
> rename from python/qemu/aqmp/qmp_shell.py
> rename to python/qemu/qmp/qmp_shell.py
> index d11bf54b00..571110f4f8 100644
> --- a/python/qemu/aqmp/qmp_shell.py
> +++ b/python/qemu/qmp/qmp_shell.py
> @@ -95,8 +95,8 @@
>      Sequence,
>  )
>  
> -from qemu.aqmp import ConnectError, QMPError, SocketAddrT
> -from qemu.aqmp.legacy import (
> +from qemu.qmp import ConnectError, QMPError, SocketAddrT
> +from qemu.qmp.legacy import (
>      QEMUMonitorProtocol,
>      QMPBadPortError,
>      QMPMessage,
> diff --git a/python/qemu/aqmp/util.py b/python/qemu/qmp/util.py
> similarity index 100%
> rename from python/qemu/aqmp/util.py
> rename to python/qemu/qmp/util.py
> diff --git a/python/qemu/utils/qemu_ga_client.py b/python/qemu/utils/qemu_ga_client.py
> index 15ed430c61..8c38a7ac9c 100644
> --- a/python/qemu/utils/qemu_ga_client.py
> +++ b/python/qemu/utils/qemu_ga_client.py
> @@ -50,8 +50,8 @@
>      Sequence,
>  )
>  
> -from qemu.aqmp import ConnectError, SocketAddrT
> -from qemu.aqmp.legacy import QEMUMonitorProtocol
> +from qemu.qmp import ConnectError, SocketAddrT
> +from qemu.qmp.legacy import QEMUMonitorProtocol
>  
>  
>  # This script has not seen many patches or careful attention in quite
> diff --git a/python/qemu/utils/qom.py b/python/qemu/utils/qom.py
> index bb5d1a78f5..bcf192f477 100644
> --- a/python/qemu/utils/qom.py
> +++ b/python/qemu/utils/qom.py
> @@ -32,7 +32,7 @@
>  
>  import argparse
>  
> -from qemu.aqmp import ExecuteError
> +from qemu.qmp import ExecuteError
>  
>  from .qom_common import QOMCommand
>  
> diff --git a/python/qemu/utils/qom_common.py b/python/qemu/utils/qom_common.py
> index e034a6f247..80da1b2304 100644
> --- a/python/qemu/utils/qom_common.py
> +++ b/python/qemu/utils/qom_common.py
> @@ -27,8 +27,8 @@
>      TypeVar,
>  )
>  
> -from qemu.aqmp import QMPError
> -from qemu.aqmp.legacy import QEMUMonitorProtocol
> +from qemu.qmp import QMPError
> +from qemu.qmp.legacy import QEMUMonitorProtocol
>  
>  
>  class ObjectPropertyInfo:
> diff --git a/python/qemu/utils/qom_fuse.py b/python/qemu/utils/qom_fuse.py
> index 653a76b93b..8dcd59fcde 100644
> --- a/python/qemu/utils/qom_fuse.py
> +++ b/python/qemu/utils/qom_fuse.py
> @@ -48,7 +48,7 @@
>  import fuse
>  from fuse import FUSE, FuseOSError, Operations
>  
> -from qemu.aqmp import ExecuteError
> +from qemu.qmp import ExecuteError
>  
>  from .qom_common import QOMCommand
>  
> diff --git a/python/setup.cfg b/python/setup.cfg
> index c341e922c2..911ae02de7 100644
> --- a/python/setup.cfg
> +++ b/python/setup.cfg
> @@ -24,7 +24,7 @@ classifiers =
>  [options]
>  python_requires = >= 3.6
>  packages =
> -    qemu.aqmp
> +    qemu.qmp
>      qemu.machine
>      qemu.utils
>  
> @@ -66,8 +66,8 @@ 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.aqmp.qmp_shell:main
> -    aqmp-tui = qemu.aqmp.aqmp_tui:main [tui]
> +    qmp-shell = qemu.qmp.qmp_shell:main
> +    aqmp-tui = qemu.qmp.aqmp_tui:main [tui]
>  
>  [flake8]
>  extend-ignore = E722  # Prefer pylint's bare-except checks to flake8's
> @@ -83,7 +83,7 @@ namespace_packages = True
>  # fusepy has no type stubs:
>  allow_subclassing_any = True
>  
> -[mypy-qemu.aqmp.aqmp_tui]
> +[mypy-qemu.qmp.aqmp_tui]
>  # urwid and urwid_readline have no type stubs:
>  allow_subclassing_any = True
>  
> diff --git a/python/tests/protocol.py b/python/tests/protocol.py
> index 5cd7938be3..8864e66a94 100644
> --- a/python/tests/protocol.py
> +++ b/python/tests/protocol.py
> @@ -6,9 +6,9 @@
>  
>  import avocado
>  
> -from qemu.aqmp import ConnectError, Runstate
> -from qemu.aqmp.protocol import AsyncProtocol, StateError
> -from qemu.aqmp.util import asyncio_run, create_task
> +from qemu.qmp import ConnectError, Runstate
> +from qemu.qmp.protocol import AsyncProtocol, StateError
> +from qemu.qmp.util import asyncio_run, create_task
>  
>  
>  class NullProtocol(AsyncProtocol[None]):
> @@ -170,7 +170,7 @@ def testDefaultName(self):
>      def testLogger(self):
>          self.assertEqual(
>              self.proto.logger.name,
> -            'qemu.aqmp.protocol'
> +            'qemu.qmp.protocol'
>          )
>  
>      def testName(self):
> @@ -183,7 +183,7 @@ def testName(self):
>  
>          self.assertEqual(
>              self.proto.logger.name,
> -            'qemu.aqmp.protocol.Steve'
> +            'qemu.qmp.protocol.Steve'
>          )
>  
>          self.assertEqual(
> @@ -418,7 +418,7 @@ async def _bad_connection(self, family: str):
>              await self.proto.accept('/dev/null')
>  
>      async def _hanging_connection(self):
> -        with TemporaryDirectory(suffix='.aqmp') as tmpdir:
> +        with TemporaryDirectory(suffix='.qmp') as tmpdir:
>              sock = os.path.join(tmpdir, type(self.proto).__name__ + ".sock")
>              await self.proto.accept(sock)
>  
> @@ -574,7 +574,7 @@ async def _asyncTearDown(self):
>  
>      @TestBase.async_test
>      async def testSmoke(self):
> -        with TemporaryDirectory(suffix='.aqmp') as tmpdir:
> +        with TemporaryDirectory(suffix='.qmp') as tmpdir:
>              sock = os.path.join(tmpdir, type(self.proto).__name__ + ".sock")
>              server_task = create_task(self.server.accept(sock))
>  
> diff --git a/scripts/cpu-x86-uarch-abi.py b/scripts/cpu-x86-uarch-abi.py
> index c262d2f027..82ff07582f 100644
> --- a/scripts/cpu-x86-uarch-abi.py
> +++ b/scripts/cpu-x86-uarch-abi.py
> @@ -6,7 +6,7 @@
>  # compatibility levels for each CPU model.
>  #
>  
> -from qemu.aqmp.legacy import QEMUMonitorProtocol
> +from qemu.qmp.legacy import QEMUMonitorProtocol
>  import sys
>  
>  if len(sys.argv) != 2:
> diff --git a/scripts/device-crash-test b/scripts/device-crash-test
> index 7fbd99158b..4bfc68c008 100755
> --- a/scripts/device-crash-test
> +++ b/scripts/device-crash-test
> @@ -36,7 +36,7 @@ from itertools import chain
>  
>  sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python'))
>  from qemu.machine import QEMUMachine
> -from qemu.aqmp import ConnectError
> +from qemu.qmp import ConnectError
>  
>  logger = logging.getLogger('device-crash-test')
>  dbg = logger.debug
> @@ -517,7 +517,7 @@ def main():
>          # Async QMP, when in use, is chatty about connection failures.
>          # This script knowingly generates a ton of connection errors.
>          # Silence this logger.
> -        logging.getLogger('qemu.aqmp.qmp_client').setLevel(logging.CRITICAL)
> +        logging.getLogger('qemu.qmp.qmp_client').setLevel(logging.CRITICAL)
>  
>      fatal_failures = []
>      wl_stats = {}
> diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
> index 31b19d73e2..4a20f97db7 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.aqmp import qmp_shell
> +from qemu.qmp import qmp_shell
>  
>  
>  if __name__ == '__main__':
> diff --git a/scripts/render_block_graph.py b/scripts/render_block_graph.py
> index 97778927f3..26f43fef27 100755
> --- a/scripts/render_block_graph.py
> +++ b/scripts/render_block_graph.py
> @@ -25,8 +25,8 @@
>  from graphviz import Digraph
>  
>  sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python'))
> -from qemu.aqmp import QMPError
> -from qemu.aqmp.legacy import QEMUMonitorProtocol
> +from qemu.qmp import QMPError
> +from qemu.qmp.legacy import QEMUMonitorProtocol
>  
>  
>  def perm(arr):
> diff --git a/scripts/simplebench/bench_block_job.py b/scripts/simplebench/bench_block_job.py
> index af9d1646a4..56191db44b 100755
> --- a/scripts/simplebench/bench_block_job.py
> +++ b/scripts/simplebench/bench_block_job.py
> @@ -27,7 +27,7 @@
>  
>  sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
>  from qemu.machine import QEMUMachine
> -from qemu.aqmp import ConnectError
> +from qemu.qmp import ConnectError
>  
>  
>  def bench_block_job(cmd, cmd_args, qemu_args):
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 98bc50cb3a..ded417c8c8 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -37,7 +37,7 @@
>  from contextlib import contextmanager
>  
>  from qemu.machine import qtest
> -from qemu.aqmp.legacy import QMPMessage
> +from qemu.qmp.legacy import QMPMessage
>  
>  # Use this logger for logging messages directly from the iotests module
>  logger = logging.getLogger('qemu.iotests')
> diff --git a/tests/qemu-iotests/tests/mirror-top-perms b/tests/qemu-iotests/tests/mirror-top-perms
> index f394931a00..d0b4449b35 100755
> --- a/tests/qemu-iotests/tests/mirror-top-perms
> +++ b/tests/qemu-iotests/tests/mirror-top-perms
> @@ -21,7 +21,7 @@
>  
>  import os
>  
> -from qemu.aqmp import ConnectError
> +from qemu.qmp import ConnectError
>  from qemu.machine import machine
>  
>  import iotests
> @@ -99,10 +99,10 @@ class TestMirrorTopPerms(iotests.QMPTestCase):
>          self.vm_b.add_blockdev(f'file,node-name=drive0,filename={source}')
>          self.vm_b.add_device('virtio-blk,drive=drive0,share-rw=on')
>          try:
> -            # Silence AQMP errors temporarily.
> +            # Silence QMP errors temporarily.
>              # TODO: Remove change_log_level and allow the errors to be logged.
>              #       This necessitates a PID filter on *all* logging output.
> -            with change_log_level('qemu.aqmp'):
> +            with change_log_level('qemu.qmp'):
>                  self.vm_b.launch()
>                  print('ERROR: VM B launched successfully, '
>                        'this should not have happened')
> -- 
> 2.31.1

Reviewed-by: Beraldo Leal <bleal@redhat.com>

--
Beraldo