[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/5] python/qmp/legacy: allow using sockets for connect()
From: |
John Snow |
Subject: |
[PULL 2/5] python/qmp/legacy: allow using sockets for connect() |
Date: |
Wed, 31 May 2023 16:43:35 -0400 |
Instead of asserting that we have an address, allow the use of sockets
instead of addresses during a call to connect().
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20230517163406.2593480-3-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/qmp/legacy.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/python/qemu/qmp/legacy.py b/python/qemu/qmp/legacy.py
index 8b09ee7dbb..b1eb3f360f 100644
--- a/python/qemu/qmp/legacy.py
+++ b/python/qemu/qmp/legacy.py
@@ -150,12 +150,13 @@ 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
+ addr_or_sock = self._address or self._sock
+ assert addr_or_sock is not None
self._qmp.await_greeting = negotiate
self._qmp.negotiate = negotiate
self._sync(
- self._qmp.connect(self._address)
+ self._qmp.connect(addr_or_sock)
)
return self._get_greeting()
--
2.40.1
- [PULL 0/5] Python patches, John Snow, 2023/05/31
- [PULL 2/5] python/qmp/legacy: allow using sockets for connect(),
John Snow <=
- [PULL 1/5] python/qmp: allow sockets to be passed to connect(), John Snow, 2023/05/31
- [PULL 3/5] python/machine: use connect-based interface for existing sockets, John Snow, 2023/05/31
- [PULL 5/5] Revert "python/qmp/protocol: add open_with_socket()", John Snow, 2023/05/31
- [PULL 4/5] python/qmp/legacy: remove open_with_socket() calls, John Snow, 2023/05/31
- Re: [PULL 0/5] Python patches, Richard Henderson, 2023/05/31