From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Hanna Reitz" <hreitz@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
"Kevin Wolf" <kwolf@redhat.com>, "Eric Blake" <eblake@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-block@nongnu.org, "John Snow" <jsnow@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 2/4] python/qmp: remove Server.wait_closed() call for Python 3.12
Date: Fri, 6 Oct 2023 15:52:41 -0400 [thread overview]
Message-ID: <20231006195243.3131140-3-jsnow@redhat.com> (raw)
In-Reply-To: <20231006195243.3131140-1-jsnow@redhat.com>
This patch is a backport from
https://gitlab.com/qemu-project/python-qemu-qmp/-/commit/e03a3334b6a477beb09b293708632f2c06fe9f61
According to Guido in https://github.com/python/cpython/issues/104344 ,
this call was never meant to wait for the server to shut down - that is
handled synchronously - but instead, this waits for all connections to
close. Or, it would have, if it wasn't broken since it was introduced.
3.12 fixes the bug, which now causes a hang in our code. The fix is just
to remove the wait.
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/qmp/protocol.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/python/qemu/qmp/protocol.py b/python/qemu/qmp/protocol.py
index 753182131f..a4ffdfad51 100644
--- a/python/qemu/qmp/protocol.py
+++ b/python/qemu/qmp/protocol.py
@@ -495,7 +495,6 @@ async def _stop_server(self) -> None:
try:
self.logger.debug("Stopping server.")
self._server.close()
- await self._server.wait_closed()
self.logger.debug("Server stopped.")
finally:
self._server = None
--
2.41.0
next prev parent reply other threads:[~2023-10-06 19:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-06 19:52 [PATCH 0/4] Python: Enable python3.12 support John Snow
2023-10-06 19:52 ` [PATCH 1/4] Python/iotests: Add type hint for nbd module John Snow
2023-10-06 20:27 ` Vladimir Sementsov-Ogievskiy
2023-10-06 19:52 ` John Snow [this message]
2023-10-06 20:35 ` [PATCH 2/4] python/qmp: remove Server.wait_closed() call for Python 3.12 Vladimir Sementsov-Ogievskiy
2023-10-06 19:52 ` [PATCH 3/4] configure: fix error message to say Python 3.8 John Snow
2023-10-06 20:35 ` Vladimir Sementsov-Ogievskiy
2023-10-06 19:52 ` [PATCH 4/4] Python: Enable python3.12 support John Snow
2023-10-06 20:39 ` Vladimir Sementsov-Ogievskiy
2023-10-06 20:40 ` Vladimir Sementsov-Ogievskiy
2023-10-06 21:06 ` 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=20231006195243.3131140-3-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=crosa@redhat.com \
--cc=eblake@redhat.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=vsementsov@yandex-team.ru \
--cc=wainersm@redhat.com \
/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).