diff options
| author | John Snow <jsnow@redhat.com> | 2023-05-17 12:34:06 -0400 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2023-05-31 16:25:35 -0400 |
| commit | c76e7652c786683edcc846ee0a7a65b587787792 (patch) | |
| tree | dadb6b4a9a4c18a011b796b891b1b6e5415f26a2 | |
| parent | 5bbc5936bb5b973848cbcabcc19346ffa812ae06 (diff) | |
| download | qemu-c76e7652c786683edcc846ee0a7a65b587787792.zip qemu-c76e7652c786683edcc846ee0a7a65b587787792.tar.gz qemu-c76e7652c786683edcc846ee0a7a65b587787792.tar.bz2 | |
Revert "python/qmp/protocol: add open_with_socket()"
This reverts commit a3cfea92e2030926e00a2519d299384ea648e36e.
(It's being rolled back in favor of a different API, which brings the
in-tree and out-of-tree versions of qemu.qmp back in sync.)
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20230517163406.2593480-6-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
| -rw-r--r-- | python/qemu/qmp/protocol.py | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/python/qemu/qmp/protocol.py b/python/qemu/qmp/protocol.py index d534db4..7531821 100644 --- a/python/qemu/qmp/protocol.py +++ b/python/qemu/qmp/protocol.py @@ -299,19 +299,6 @@ class AsyncProtocol(Generic[T]): @upper_half @require(Runstate.IDLE) - async def open_with_socket(self, sock: socket.socket) -> None: - """ - Start connection with given socket. - - :param sock: A socket. - - :raise StateError: When the `Runstate` is not `IDLE`. - """ - self._reader, self._writer = await asyncio.open_connection(sock=sock) - self._set_state(Runstate.CONNECTING) - - @upper_half - @require(Runstate.IDLE) async def start_server(self, address: SocketAddrT, ssl: Optional[SSLContext] = None) -> None: """ @@ -357,12 +344,11 @@ class AsyncProtocol(Generic[T]): protocol-level failure occurs while establishing a new session, the wrapped error may also be an `QMPError`. """ - if not self._reader: - if self._accepted is None: - raise QMPError("Cannot call accept() before start_server().") - await self._session_guard( - self._do_accept(), - 'Failed to establish connection') + if self._accepted is None: + raise QMPError("Cannot call accept() before start_server().") + await self._session_guard( + self._do_accept(), + 'Failed to establish connection') await self._session_guard( self._establish_session(), 'Failed to establish session') |