[PULL,02/25] python/machine: close sock_pair in cleanup path

Commit Message

John Snow Oct. 13, 2023, 7:09 p.m. UTC

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 <[e-mail]>
Reviewed-by: Ani Sinha <[e-mail]>
Reviewed-by: Daniel P. Berrangé <[e-mail]>
Message-id: [e-mail]
Signed-off-by: John Snow <[e-mail]>
---
 python/qemu/machine/machine.py | 5 +++++
 1 file changed, 5 insertions(+)

Patch

diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
index 345610d6e4..e26109e6f0 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()