[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/7] python/qmp/legacy: make QEMUMonitorProtocol accept a socket
From: |
John Snow |
Subject: |
[PULL 6/7] python/qmp/legacy: make QEMUMonitorProtocol accept a socket |
Date: |
Tue, 24 Jan 2023 21:34:44 -0500 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Teach QEMUMonitorProtocol to accept an exisiting socket.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20230111080101.969151-3-marcandre.lureau@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/qmp/legacy.py | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/python/qemu/qmp/legacy.py b/python/qemu/qmp/legacy.py
index 1951754455a..8b09ee7dbb5 100644
--- a/python/qemu/qmp/legacy.py
+++ b/python/qemu/qmp/legacy.py
@@ -22,6 +22,7 @@
#
import asyncio
+import socket
from types import TracebackType
from typing import (
Any,
@@ -69,22 +70,32 @@ class QEMUMonitorProtocol:
:param address: QEMU address, can be either a unix socket path (string)
or a tuple in the form ( address, port ) for a TCP
- connection
+ connection or None
+ :param sock: a socket or None
:param server: Act as the socket server. (See 'accept')
:param nickname: Optional nickname used for logging.
"""
- def __init__(self, address: SocketAddrT,
+ def __init__(self,
+ address: Optional[SocketAddrT] = None,
+ sock: Optional[socket.socket] = None,
server: bool = False,
nickname: Optional[str] = None):
+ assert address or sock
self._qmp = QMPClient(nickname)
self._aloop = asyncio.get_event_loop()
self._address = address
+ self._sock = sock
self._timeout: Optional[float] = None
if server:
- self._sync(self._qmp.start_server(self._address))
+ if sock:
+ assert self._sock is not None
+ self._sync(self._qmp.open_with_socket(self._sock))
+ else:
+ assert self._address is not None
+ self._sync(self._qmp.start_server(self._address))
_T = TypeVar('_T')
@@ -139,6 +150,7 @@ def connect(self, negotiate: bool = True) ->
Optional[QMPMessage]:
:return: QMP greeting dict, or None if negotiate is false
:raise ConnectError: on connection errors
"""
+ assert self._address is not None
self._qmp.await_greeting = negotiate
self._qmp.negotiate = negotiate
--
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, 2023/01/24
- [PULL 6/7] python/qmp/legacy: make QEMUMonitorProtocol accept a socket,
John Snow <=
- [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