From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Cédric Le Goater" <clg@kaod.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Kevin Wolf" <kwolf@redhat.com>,
"Andrew Jeffery" <andrew@aj.id.au>,
"John Snow" <jsnow@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Cleber Rosa" <crosa@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
qemu-arm@nongnu.org, "Joel Stanley" <joel@jms.id.au>,
qemu-block@nongnu.org, "Beraldo Leal" <bleal@redhat.com>,
"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
"Hanna Reitz" <hreitz@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Vladimir Sementsov-Ogievskiy" <v.sementsov-og@mail.ru>,
"Thomas Huth" <thuth@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
"Ani Sinha" <anisinha@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Markus Armbruster" <armbru@redhat.com>
Subject: [PULL 8/9] python/qmp: remove Server.wait_closed() call for Python 3.12
Date: Wed, 4 Oct 2023 15:46:12 -0400 [thread overview]
Message-ID: <20231004194613.2900323-9-jsnow@redhat.com> (raw)
In-Reply-To: <20231004194613.2900323-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 753182131fd..a4ffdfad51b 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-04 19:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-04 19:46 [PULL 0/9] Python patches John Snow
2023-10-04 19:46 ` [PULL 1/9] Python/iotests: Add type hint for nbd module John Snow
2023-10-05 14:05 ` Eric Blake
2023-10-05 14:55 ` John Snow
2023-10-04 19:46 ` [PULL 2/9] python/machine: move socket setup out of _base_args property John Snow
2023-10-04 19:46 ` [PULL 3/9] python/machine: close sock_pair in cleanup path John Snow
2023-10-04 19:46 ` [PULL 4/9] python/console_socket: accept existing FD in initializer John Snow
2023-10-04 19:46 ` [PULL 5/9] python/machine: use socketpair() for console connections John Snow
2023-10-04 19:46 ` [PULL 6/9] python/machine: use socketpair() for qtest connection John Snow
2023-10-04 19:46 ` [PULL 7/9] python/machine: remove unused sock_dir argument John Snow
2023-10-04 19:46 ` John Snow [this message]
2023-10-04 19:46 ` [PULL 9/9] Python: test Python 3.12 John Snow
2023-10-05 4:48 ` [PULL 0/9] Python patches Philippe Mathieu-Daudé
2023-10-05 13:00 ` Stefan Hajnoczi
2023-10-05 14:59 ` 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=20231004194613.2900323-9-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=andrew@aj.id.au \
--cc=anisinha@redhat.com \
--cc=armbru@redhat.com \
--cc=bleal@redhat.com \
--cc=clg@kaod.org \
--cc=crosa@redhat.com \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=hreitz@redhat.com \
--cc=joel@jms.id.au \
--cc=kwolf@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=v.sementsov-og@mail.ru \
--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).