[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 17/31] python/machine: permanently switch to AQMP
From: |
John Snow |
Subject: |
[PATCH v3 17/31] python/machine: permanently switch to AQMP |
Date: |
Mon, 10 Jan 2022 18:28:56 -0500 |
Remove the QEMU_PYTHON_LEGACY_QMP environment variable, making the
switch permanent. Update Exceptions and import paths as necessary.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Beraldo Leal <bleal@redhat.com>
---
python/qemu/machine/machine.py | 18 +++++++-----------
python/qemu/machine/qtest.py | 2 +-
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
index 67ab06ca2b..21fb4a4f30 100644
--- a/python/qemu/machine/machine.py
+++ b/python/qemu/machine/machine.py
@@ -40,21 +40,16 @@
TypeVar,
)
-from qemu.qmp import ( # pylint: disable=import-error
+from qemu.aqmp import SocketAddrT
+from qemu.aqmp.legacy import (
+ QEMUMonitorProtocol,
QMPMessage,
QMPReturnValue,
- SocketAddrT,
)
from . import console_socket
-if os.environ.get('QEMU_PYTHON_LEGACY_QMP'):
- from qemu.qmp import QEMUMonitorProtocol
-else:
- from qemu.aqmp.legacy import QEMUMonitorProtocol
-
-
LOG = logging.getLogger(__name__)
@@ -710,8 +705,9 @@ def events_wait(self,
:param timeout: Optional timeout, in seconds.
See QEMUMonitorProtocol.pull_event.
- :raise QMPTimeoutError: If timeout was non-zero and no matching events
- were found.
+ :raise asyncio.TimeoutError:
+ If timeout was non-zero and no matching events were found.
+
:return: A QMP event matching the filter criteria.
If timeout was 0 and no event matched, None.
"""
@@ -734,7 +730,7 @@ def _match(event: QMPMessage) -> bool:
event = self._qmp.pull_event(wait=timeout)
if event is None:
# NB: None is only returned when timeout is false-ish.
- # Timeouts raise QMPTimeoutError instead!
+ # Timeouts raise asyncio.TimeoutError instead!
break
if _match(event):
return event
diff --git a/python/qemu/machine/qtest.py b/python/qemu/machine/qtest.py
index f2f9aaa5e5..13e0aaff84 100644
--- a/python/qemu/machine/qtest.py
+++ b/python/qemu/machine/qtest.py
@@ -26,7 +26,7 @@
TextIO,
)
-from qemu.qmp import SocketAddrT # pylint: disable=import-error
+from qemu.aqmp import SocketAddrT
from .machine import QEMUMachine
--
2.31.1
- [PATCH v3 12/31] python/qmp: switch qemu-ga-client to AQMP, (continued)
- [PATCH v3 12/31] python/qmp: switch qemu-ga-client to AQMP, John Snow, 2022/01/10
- [PATCH v3 10/31] python/aqmp: rename AQMPError to QMPError, John Snow, 2022/01/10
- [PATCH v3 16/31] python: move qmp-shell under the AQMP package, John Snow, 2022/01/10
- [PATCH v3 14/31] python/qmp: switch qmp-shell to AQMP, John Snow, 2022/01/10
- [PATCH v3 15/31] python: move qmp utilities to python/qemu/utils, John Snow, 2022/01/10
- [PATCH v3 17/31] python/machine: permanently switch to AQMP,
John Snow <=
- [PATCH v3 13/31] python/qmp: switch qom tools to AQMP, John Snow, 2022/01/10
- [PATCH v3 19/31] scripts/cpu-x86-uarch-abi: switch to AQMP, John Snow, 2022/01/10
- [PATCH v3 18/31] scripts/cpu-x86-uarch-abi: fix CLI parsing, John Snow, 2022/01/10
- [PATCH v3 20/31] scripts/render-block-graph: switch to AQMP, John Snow, 2022/01/10
- [PATCH v3 21/31] scripts/bench-block-job: switch to AQMP, John Snow, 2022/01/10
- [PATCH v3 22/31] iotests/mirror-top-perms: switch to AQMP, John Snow, 2022/01/10
- [PATCH v3 25/31] python/aqmp: take QMPBadPortError and parse_address from qemu.qmp, John Snow, 2022/01/10
- [PATCH v3 24/31] python: temporarily silence pylint duplicate-code warnings, John Snow, 2022/01/10
- [PATCH v3 23/31] iotests: switch to AQMP, John Snow, 2022/01/10