01f9005feb
- Backport aqmp patches from upstream which can fix iotest issues * Patches added: python-aqmp-add-__del__-method-to-legacy.patch python-aqmp-add-_session_guard.patch python-aqmp-add-SocketAddrT-to-package-r.patch python-aqmp-add-socket-bind-step-to-lega.patch python-aqmp-add-start_server-and-accept-.patch python-aqmp-copy-type-definitions-from-q.patch python-aqmp-drop-_bind_hack.patch python-aqmp-fix-docstring-typo.patch python-aqmp-Fix-negotiation-with-pre-oob.patch python-aqmp-fix-race-condition-in-legacy.patch Python-aqmp-fix-type-definitions-for-myp.patch python-aqmp-handle-asyncio.TimeoutError-.patch python-aqmp-refactor-_do_accept-into-two.patch python-aqmp-remove-_new_session-and-_est.patch python-aqmp-rename-accept-to-start_serve.patch python-aqmp-rename-AQMPError-to-QMPError.patch python-aqmp-split-_client_connected_cb-o.patch python-aqmp-squelch-pylint-warning-for-t.patch python-aqmp-stop-the-server-during-disco.patch python-introduce-qmp-shell-wrap-convenie.patch python-machine-raise-VMLaunchFailure-exc.patch python-move-qmp-shell-under-the-AQMP-pac.patch python-move-qmp-utilities-to-python-qemu.patch python-qmp-switch-qmp-shell-to-AQMP.patch python-support-recording-QMP-session-to-.patch python-upgrade-mypy-to-0.780.patch - Drop the patches which are workaround to fix iotest issues * Patches dropped: Revert-python-iotests-replace-qmp-with-a.patch Revert-python-machine-add-instance-disam.patch Revert-python-machine-add-sock_dir-prope.patch Revert-python-machine-handle-fast-QEMU-t.patch Revert-python-machine-move-more-variable.patch Revert-python-machine-remove-_remove_mon.patch OBS-URL: https://build.opensuse.org/request/show/966963 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=708
222 lines
7.4 KiB
Diff
222 lines
7.4 KiB
Diff
From: John Snow <jsnow@redhat.com>
|
|
Date: Mon, 10 Jan 2022 18:28:49 -0500
|
|
Subject: python/aqmp: rename AQMPError to QMPError
|
|
|
|
Git-commit: 6e7751dc388df6daf425db0e245d4d3a10859803
|
|
|
|
This is in preparation for renaming qemu.aqmp to qemu.qmp. I should have
|
|
done this from this from the very beginning, but it's a convenient time
|
|
to make sure this churn is taken care of.
|
|
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Signed-off-by: Li Zhang <lizhang@suse.de>
|
|
---
|
|
python/qemu/aqmp/__init__.py | 6 +++---
|
|
python/qemu/aqmp/error.py | 12 ++++++------
|
|
python/qemu/aqmp/events.py | 4 ++--
|
|
python/qemu/aqmp/legacy.py | 4 ++--
|
|
python/qemu/aqmp/protocol.py | 8 ++++----
|
|
python/qemu/aqmp/qmp_client.py | 8 ++++----
|
|
6 files changed, 21 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/python/qemu/aqmp/__init__.py b/python/qemu/aqmp/__init__.py
|
|
index 05f467c1415360169e9c66c8d27e..4c22c380790fd0f86402e402628b 100644
|
|
--- a/python/qemu/aqmp/__init__.py
|
|
+++ b/python/qemu/aqmp/__init__.py
|
|
@@ -6,7 +6,7 @@ asynchronously with QMP protocol servers, as implemented by QEMU, the
|
|
QEMU Guest Agent, and the QEMU Storage Daemon.
|
|
|
|
`QMPClient` provides the main functionality of this package. All errors
|
|
-raised by this library derive from `AQMPError`, see `aqmp.error` for
|
|
+raised by this library derive from `QMPError`, see `aqmp.error` for
|
|
additional detail. See `aqmp.events` for an in-depth tutorial on
|
|
managing QMP events.
|
|
"""
|
|
@@ -23,7 +23,7 @@ managing QMP events.
|
|
|
|
import logging
|
|
|
|
-from .error import AQMPError
|
|
+from .error import QMPError
|
|
from .events import EventListener
|
|
from .message import Message
|
|
from .protocol import (
|
|
@@ -48,7 +48,7 @@ __all__ = (
|
|
'Runstate',
|
|
|
|
# Exceptions, most generic to most explicit
|
|
- 'AQMPError',
|
|
+ 'QMPError',
|
|
'StateError',
|
|
'ConnectError',
|
|
'ExecuteError',
|
|
diff --git a/python/qemu/aqmp/error.py b/python/qemu/aqmp/error.py
|
|
index 781f49b00877893d7a88f755c67f..24ba4d505410b5fe56390e3d4e02 100644
|
|
--- a/python/qemu/aqmp/error.py
|
|
+++ b/python/qemu/aqmp/error.py
|
|
@@ -1,21 +1,21 @@
|
|
"""
|
|
-AQMP Error Classes
|
|
+QMP Error Classes
|
|
|
|
This package seeks to provide semantic error classes that are intended
|
|
to be used directly by clients when they would like to handle particular
|
|
semantic failures (e.g. "failed to connect") without needing to know the
|
|
enumeration of possible reasons for that failure.
|
|
|
|
-AQMPError serves as the ancestor for all exceptions raised by this
|
|
+QMPError serves as the ancestor for all exceptions raised by this
|
|
package, and is suitable for use in handling semantic errors from this
|
|
library. In most cases, individual public methods will attempt to catch
|
|
and re-encapsulate various exceptions to provide a semantic
|
|
error-handling interface.
|
|
|
|
-.. admonition:: AQMP Exception Hierarchy Reference
|
|
+.. admonition:: QMP Exception Hierarchy Reference
|
|
|
|
| `Exception`
|
|
- | +-- `AQMPError`
|
|
+ | +-- `QMPError`
|
|
| +-- `ConnectError`
|
|
| +-- `StateError`
|
|
| +-- `ExecInterruptedError`
|
|
@@ -31,11 +31,11 @@ error-handling interface.
|
|
"""
|
|
|
|
|
|
-class AQMPError(Exception):
|
|
+class QMPError(Exception):
|
|
"""Abstract error class for all errors originating from this package."""
|
|
|
|
|
|
-class ProtocolError(AQMPError):
|
|
+class ProtocolError(QMPError):
|
|
"""
|
|
Abstract error class for protocol failures.
|
|
|
|
diff --git a/python/qemu/aqmp/events.py b/python/qemu/aqmp/events.py
|
|
index 5f7150c78d49d9513978103dc9a7..f3d4e2b5e853c39db9e016009db0 100644
|
|
--- a/python/qemu/aqmp/events.py
|
|
+++ b/python/qemu/aqmp/events.py
|
|
@@ -443,7 +443,7 @@ from typing import (
|
|
Union,
|
|
)
|
|
|
|
-from .error import AQMPError
|
|
+from .error import QMPError
|
|
from .message import Message
|
|
|
|
|
|
@@ -451,7 +451,7 @@ EventNames = Union[str, Iterable[str], None]
|
|
EventFilter = Callable[[Message], bool]
|
|
|
|
|
|
-class ListenerError(AQMPError):
|
|
+class ListenerError(QMPError):
|
|
"""
|
|
Generic error class for `EventListener`-related problems.
|
|
"""
|
|
diff --git a/python/qemu/aqmp/legacy.py b/python/qemu/aqmp/legacy.py
|
|
index 9431fe933019b1e1c221ea3ab7bb..27df22818a76190e872f08c0852e 100644
|
|
--- a/python/qemu/aqmp/legacy.py
|
|
+++ b/python/qemu/aqmp/legacy.py
|
|
@@ -17,7 +17,7 @@ from typing import (
|
|
|
|
import qemu.qmp
|
|
|
|
-from .error import AQMPError
|
|
+from .error import QMPError
|
|
from .protocol import Runstate, SocketAddrT
|
|
from .qmp_client import QMPClient
|
|
|
|
@@ -168,7 +168,7 @@ class QEMUMonitorProtocol(qemu.qmp.QEMUMonitorProtocol):
|
|
# Nothing we can do about it now, but if we don't raise our
|
|
# own error, the user will be treated to a lot of traceback
|
|
# they might not understand.
|
|
- raise AQMPError(
|
|
+ raise QMPError(
|
|
"QEMUMonitorProtocol.close()"
|
|
" was not called before object was garbage collected"
|
|
)
|
|
diff --git a/python/qemu/aqmp/protocol.py b/python/qemu/aqmp/protocol.py
|
|
index 5b4f2f0d0a81a0d2902358e9b799..50e973c2f2dc9c5fa759380ab3e9 100644
|
|
--- a/python/qemu/aqmp/protocol.py
|
|
+++ b/python/qemu/aqmp/protocol.py
|
|
@@ -29,7 +29,7 @@ from typing import (
|
|
cast,
|
|
)
|
|
|
|
-from .error import AQMPError
|
|
+from .error import QMPError
|
|
from .util import (
|
|
bottom_half,
|
|
create_task,
|
|
@@ -65,7 +65,7 @@ class Runstate(Enum):
|
|
DISCONNECTING = 3
|
|
|
|
|
|
-class ConnectError(AQMPError):
|
|
+class ConnectError(QMPError):
|
|
"""
|
|
Raised when the initial connection process has failed.
|
|
|
|
@@ -90,7 +90,7 @@ class ConnectError(AQMPError):
|
|
return f"{self.error_message}: {cause}"
|
|
|
|
|
|
-class StateError(AQMPError):
|
|
+class StateError(QMPError):
|
|
"""
|
|
An API command (connect, execute, etc) was issued at an inappropriate time.
|
|
|
|
@@ -363,7 +363,7 @@ class AsyncProtocol(Generic[T]):
|
|
This exception will wrap a more concrete one. In most cases,
|
|
the wrapped exception will be `OSError` or `EOFError`. If a
|
|
protocol-level failure occurs while establishing a new
|
|
- session, the wrapped error may also be an `AQMPError`.
|
|
+ session, the wrapped error may also be an `QMPError`.
|
|
"""
|
|
assert self.runstate == Runstate.IDLE
|
|
|
|
diff --git a/python/qemu/aqmp/qmp_client.py b/python/qemu/aqmp/qmp_client.py
|
|
index 45864f288e4fe5a7505c0022ed13..90a8737f03a997f6813ee7cbcaac 100644
|
|
--- a/python/qemu/aqmp/qmp_client.py
|
|
+++ b/python/qemu/aqmp/qmp_client.py
|
|
@@ -20,7 +20,7 @@ from typing import (
|
|
cast,
|
|
)
|
|
|
|
-from .error import AQMPError, ProtocolError
|
|
+from .error import ProtocolError, QMPError
|
|
from .events import Events
|
|
from .message import Message
|
|
from .models import ErrorResponse, Greeting
|
|
@@ -66,7 +66,7 @@ class NegotiationError(_WrappedProtocolError):
|
|
"""
|
|
|
|
|
|
-class ExecuteError(AQMPError):
|
|
+class ExecuteError(QMPError):
|
|
"""
|
|
Exception raised by `QMPClient.execute()` on RPC failure.
|
|
|
|
@@ -87,7 +87,7 @@ class ExecuteError(AQMPError):
|
|
self.error_class: str = error_response.error.class_
|
|
|
|
|
|
-class ExecInterruptedError(AQMPError):
|
|
+class ExecInterruptedError(QMPError):
|
|
"""
|
|
Exception raised by `execute()` (et al) when an RPC is interrupted.
|
|
|
|
@@ -641,7 +641,7 @@ class QMPClient(AsyncProtocol[Message], Events):
|
|
sock = self._writer.transport.get_extra_info('socket')
|
|
|
|
if sock.family != socket.AF_UNIX:
|
|
- raise AQMPError("Sending file descriptors requires a UNIX socket.")
|
|
+ raise QMPError("Sending file descriptors requires a UNIX socket.")
|
|
|
|
if not hasattr(sock, 'sendmsg'):
|
|
# We need to void the warranty sticker.
|