From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "John Snow" <jsnow@redhat.com>,
"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
"Beraldo Leal" <bleal@redhat.com>,
"Daniel Berrange" <berrange@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PATCH 2/5] python/qmp/legacy: allow using sockets for connect()
Date: Wed, 17 May 2023 12:34:03 -0400 [thread overview]
Message-ID: <20230517163406.2593480-3-jsnow@redhat.com> (raw)
In-Reply-To: <20230517163406.2593480-1-jsnow@redhat.com>
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>
---
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.0
next prev parent reply other threads:[~2023-05-17 16:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-17 16:34 [PATCH 0/5] python: backport socket changes from python-qemu-qmp John Snow
2023-05-17 16:34 ` [PATCH 1/5] python/qmp: allow sockets to be passed to connect() John Snow
2023-05-17 16:34 ` John Snow [this message]
2023-05-17 16:34 ` [PATCH 3/5] python/machine: use connect-based interface for existing sockets John Snow
2023-05-17 16:34 ` [PATCH 4/5] python/qmp/legacy: remove open_with_socket() calls John Snow
2023-05-17 16:34 ` [PATCH 5/5] Revert "python/qmp/protocol: add open_with_socket()" John Snow
2023-05-23 14:40 ` [PATCH 0/5] python: backport socket changes from python-qemu-qmp John Snow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230517163406.2593480-3-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=berrange@redhat.com \
--cc=bleal@redhat.com \
--cc=crosa@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@yandex-team.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).