From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Beraldo Leal" <bleal@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
qemu-block@nongnu.org, "Hanna Reitz" <hreitz@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"John Snow" <jsnow@redhat.com>,
qemu-arm@nongnu.org, "Joel Stanley" <joel@jms.id.au>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Andrew Jeffery" <andrew@aj.id.au>,
"Daniel Berrange" <berrange@redhat.com>,
"Ani Sinha" <anisinha@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>
Subject: [PATCH v3 2/6] python/machine: close sock_pair in cleanup path
Date: Thu, 28 Sep 2023 00:49:39 -0400 [thread overview]
Message-ID: <20230928044943.849073-3-jsnow@redhat.com> (raw)
In-Reply-To: <20230928044943.849073-1-jsnow@redhat.com>
If everything has gone smoothly, we'll already have closed the socket we
gave to the child during post_launch. The other half of the pair that we
gave to the QMP connection should, likewise, be definitively closed by
now.
However, in the cleanup path, it's possible we've created the socketpair
but flubbed the launch and need to clean up resources. These resources
*would* be handled by the garbage collector, but that can happen at
unpredictable times. Nicer to just clean them up synchronously on the
exit path, here.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Ani Sinha <anisinha@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
python/qemu/machine/machine.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
index 345610d6e46..e26109e6f0e 100644
--- a/python/qemu/machine/machine.py
+++ b/python/qemu/machine/machine.py
@@ -396,6 +396,11 @@ def _post_shutdown(self) -> None:
finally:
assert self._qmp_connection is None
+ if self._sock_pair:
+ self._sock_pair[0].close()
+ self._sock_pair[1].close()
+ self._sock_pair = None
+
self._close_qemu_log_file()
self._load_io_log()
--
2.41.0
next prev parent reply other threads:[~2023-09-28 4:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-28 4:49 [PATCH v3 0/6] python/machine: use socketpair() for console socket John Snow
2023-09-28 4:49 ` [PATCH v3 1/6] python/machine: move socket setup out of _base_args property John Snow
2023-09-28 4:49 ` John Snow [this message]
2023-09-28 4:49 ` [PATCH v3 3/6] python/console_socket: accept existing FD in initializer John Snow
2023-09-28 4:49 ` [PATCH v3 4/6] python/machine: use socketpair() for console connections John Snow
2023-09-28 4:49 ` [PATCH v3 5/6] python/machine: use socketpair() for qtest connection John Snow
2023-09-28 4:49 ` [PATCH v3 6/6] python/machine: remove unused sock_dir argument John Snow
2023-09-28 8:12 ` [PATCH v3 0/6] python/machine: use socketpair() for console socket Daniel P. Berrangé
2023-09-28 13:23 ` 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=20230928044943.849073-3-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=andrew@aj.id.au \
--cc=anisinha@redhat.com \
--cc=berrange@redhat.com \
--cc=bleal@redhat.com \
--cc=clg@kaod.org \
--cc=crosa@redhat.com \
--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=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).