[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/19] python/machine.py: Close QMP socket in cleanup
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 03/19] python/machine.py: Close QMP socket in cleanup |
Date: |
Wed, 15 Jul 2020 00:21:16 +0200 |
From: John Snow <jsnow@redhat.com>
It's not important to do this before waiting for the process to exit, so
it can be done during generic post-shutdown cleanup.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Tested-by: Cleber Rosa <crosa@redhat.com>
Message-Id: <20200710050649.32434-3-jsnow@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
python/qemu/machine.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/python/qemu/machine.py b/python/qemu/machine.py
index ca1f2114e6..d3faa9a84c 100644
--- a/python/qemu/machine.py
+++ b/python/qemu/machine.py
@@ -294,6 +294,10 @@ def _post_launch(self):
self._qmp.accept()
def _post_shutdown(self):
+ if self._qmp:
+ self._qmp.close()
+ self._qmp = None
+
self._load_io_log()
if self._qemu_log_file is not None:
@@ -366,8 +370,6 @@ def wait(self):
Wait for the VM to power off
"""
self._popen.wait()
- if self._qmp:
- self._qmp.close()
self._post_shutdown()
def shutdown(self, has_quit=False, hard=False):
@@ -388,7 +390,6 @@ def shutdown(self, has_quit=False, hard=False):
try:
if not has_quit:
self._qmp.cmd('quit')
- self._qmp.close()
self._popen.wait(timeout=3)
except:
self._popen.kill()
--
2.21.3
- [PULL 00/19] Python patches for 5.1, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 01/19] scripts/performance: Add dissect.py script, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 02/19] python/machine.py: consolidate _post_shutdown(), Philippe Mathieu-Daudé, 2020/07/14
- [PULL 03/19] python/machine.py: Close QMP socket in cleanup,
Philippe Mathieu-Daudé <=
- [PULL 04/19] python/machine.py: Add _early_cleanup hook, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 05/19] python/machine.py: Perform early cleanup for wait() calls, too, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 06/19] python/machine.py: Prohibit multiple shutdown() calls, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 07/19] python/machine.py: Add a configurable timeout to shutdown(), Philippe Mathieu-Daudé, 2020/07/14
- [PULL 08/19] python/machine.py: Make wait() call shutdown(), Philippe Mathieu-Daudé, 2020/07/14
- [PULL 09/19] tests/acceptance: wait() instead of shutdown() where appropriate, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 11/19] python/machine.py: split shutdown into hard and soft flavors, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 10/19] tests/acceptance: Don't test reboot on cubieboard, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 12/19] python/machine.py: re-add sigkill warning suppression, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 13/19] python/machine.py: change default wait timeout to 3 seconds, Philippe Mathieu-Daudé, 2020/07/14