Dario Faggioli
3206ea7c01
- Revert to revision 715. We're fixing bug 1199924, before moving to QEMU 7.0 OBS-URL: https://build.opensuse.org/request/show/979479 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=718
103 lines
4.0 KiB
Diff
103 lines
4.0 KiB
Diff
From: John Snow <jsnow@redhat.com>
|
|
Date: Fri, 25 Feb 2022 15:59:44 -0500
|
|
Subject: python/aqmp: refactor _do_accept() into two distinct steps
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Git-commit: 5e9902a030ab832b0b6577764c65ce6a6f874af6
|
|
|
|
Refactor _do_accept() into _do_start_server() and _do_accept(). As of
|
|
this commit, the former calls the latter, but in subsequent commits
|
|
they'll be split apart.
|
|
|
|
(So please forgive the misnomer for _do_start_server(); it will live up
|
|
to its name shortly, and the docstring will be updated then too. I'm
|
|
just cutting down on some churn.)
|
|
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Message-id: 20220225205948.3693480-7-jsnow@redhat.com
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
Signed-off-by: Li Zhang <lizhang@suse.de>
|
|
---
|
|
python/qemu/aqmp/protocol.py | 29 ++++++++++++++++++++++++-----
|
|
python/tests/protocol.py | 4 ++--
|
|
2 files changed, 26 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/python/qemu/aqmp/protocol.py b/python/qemu/aqmp/protocol.py
|
|
index 631bcdaa554f4a104af4e25a3c61..e2bdad542dc0ef451dd200a1d679 100644
|
|
--- a/python/qemu/aqmp/protocol.py
|
|
+++ b/python/qemu/aqmp/protocol.py
|
|
@@ -295,7 +295,7 @@ class AsyncProtocol(Generic[T]):
|
|
session, the wrapped error may also be an `QMPError`.
|
|
"""
|
|
await self._session_guard(
|
|
- self._do_accept(address, ssl),
|
|
+ self._do_start_server(address, ssl),
|
|
'Failed to establish connection')
|
|
await self._session_guard(
|
|
self._establish_session(),
|
|
@@ -509,8 +509,8 @@ class AsyncProtocol(Generic[T]):
|
|
self._sock = sock
|
|
|
|
@upper_half
|
|
- async def _do_accept(self, address: SocketAddrT,
|
|
- ssl: Optional[SSLContext] = None) -> None:
|
|
+ async def _do_start_server(self, address: SocketAddrT,
|
|
+ ssl: Optional[SSLContext] = None) -> None:
|
|
"""
|
|
Acting as the transport server, accept a single connection.
|
|
|
|
@@ -551,9 +551,28 @@ class AsyncProtocol(Generic[T]):
|
|
# otherwise yield.
|
|
await asyncio.sleep(0)
|
|
|
|
- self._server = await coro # Starts listening
|
|
- await self._accepted.wait() # Waits for the callback to finish
|
|
+ # This will start the server (bind(2), listen(2)). It will also
|
|
+ # call accept(2) if we yield, but we don't block on that here.
|
|
+ self._server = await coro
|
|
+
|
|
+ # Just for this one commit, wait for a peer.
|
|
+ # This gets split out in the next patch.
|
|
+ await self._do_accept()
|
|
+
|
|
+ @upper_half
|
|
+ async def _do_accept(self) -> None:
|
|
+ """
|
|
+ Wait for and accept an incoming connection.
|
|
+
|
|
+ Requires that we have not yet accepted an incoming connection
|
|
+ from the upper_half, but it's OK if the server is no longer
|
|
+ running because the bottom_half has already accepted the
|
|
+ connection.
|
|
+ """
|
|
+ assert self._accepted is not None
|
|
+ await self._accepted.wait()
|
|
assert self._server is None
|
|
+ self._accepted = None
|
|
self._sock = None
|
|
|
|
self.logger.debug("Connection accepted.")
|
|
diff --git a/python/tests/protocol.py b/python/tests/protocol.py
|
|
index 8dd26c4ed1e0973b8058604c2373..5e442e1efbd19bf95a95de371060 100644
|
|
--- a/python/tests/protocol.py
|
|
+++ b/python/tests/protocol.py
|
|
@@ -41,12 +41,12 @@ class NullProtocol(AsyncProtocol[None]):
|
|
self.trigger_input = asyncio.Event()
|
|
await super()._establish_session()
|
|
|
|
- async def _do_accept(self, address, ssl=None):
|
|
+ async def _do_start_server(self, address, ssl=None):
|
|
if self.fake_session:
|
|
self._set_state(Runstate.CONNECTING)
|
|
await asyncio.sleep(0)
|
|
else:
|
|
- await super()._do_accept(address, ssl)
|
|
+ await super()._do_start_server(address, ssl)
|
|
|
|
async def _do_connect(self, address, ssl=None):
|
|
if self.fake_session:
|