[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/7] python/qmp/protocol: add open_with_socket()
From: |
John Snow |
Subject: |
[PULL 5/7] python/qmp/protocol: add open_with_socket() |
Date: |
Tue, 24 Jan 2023 21:34:43 -0500 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Instead of listening for incoming connections with a SocketAddr, add a
new method open_with_socket() that accepts an existing socket.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20230111080101.969151-2-marcandre.lureau@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/qmp/protocol.py | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/python/qemu/qmp/protocol.py b/python/qemu/qmp/protocol.py
index 15909b7dbad..6d3d739daa7 100644
--- a/python/qemu/qmp/protocol.py
+++ b/python/qemu/qmp/protocol.py
@@ -18,6 +18,7 @@
from enum import Enum
from functools import wraps
import logging
+import socket
from ssl import SSLContext
from typing import (
Any,
@@ -296,6 +297,19 @@ async def start_server_and_accept(
await self.accept()
assert self.runstate == Runstate.RUNNING
+ @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,
@@ -343,11 +357,12 @@ async def accept(self) -> None:
protocol-level failure occurs while establishing a new
session, the wrapped error may also be an `QMPError`.
"""
- 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 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')
await self._session_guard(
self._establish_session(),
'Failed to establish session')
--
2.39.0
- [PULL 0/7] Python patches, John Snow, 2023/01/24
- [PULL 2/7] python: QEMUMachine: enable qmp accept timeout by default, John Snow, 2023/01/24
- [PULL 4/7] python/qmp: increase read buffer size, John Snow, 2023/01/24
- [PULL 1/7] Fix some typos, John Snow, 2023/01/24
- [PULL 5/7] python/qmp/protocol: add open_with_socket(),
John Snow <=
- [PULL 6/7] python/qmp/legacy: make QEMUMonitorProtocol accept a socket, John Snow, 2023/01/24
- [PULL 7/7] python/qemu/machine: use socketpair() for QMP by default, John Snow, 2023/01/24
- [PULL 3/7] python/machine: Fix AF_UNIX path too long on macOS, John Snow, 2023/01/24