[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 08/18] qemu.py: Close _qmp inside _post_shutdown()
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC 08/18] qemu.py: Close _qmp inside _post_shutdown() |
Date: |
Thu, 29 Mar 2018 18:38:47 -0300 |
This way all shutdown-related cleanup is kept in a single place.
While at it, set _qmp to None after closing the socket, to avoid
trying to reuse it by mistake later.
Signed-off-by: Eduardo Habkost <address@hidden>
---
scripts/qemu.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts/qemu.py b/scripts/qemu.py
index 4a71542c6b..1241e7f10b 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -199,6 +199,10 @@ class QEMUMachine(object):
self._qmp.accept()
def _post_shutdown(self):
+ if self._qmp is not None:
+ self._qmp.close()
+ self._qmp = None
+
self._load_io_log()
if self._qemu_log_file is not None:
self._qemu_log_file.close()
@@ -250,7 +254,6 @@ class QEMUMachine(object):
def wait(self):
'''Wait for the VM to power off'''
self._popen.wait()
- self._qmp.close()
self._post_shutdown()
def shutdown(self):
--
2.14.3
- [Qemu-devel] [RFC 00/18] QEMU validator: A method to specify QEMU crash-test cases, Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 01/18] qmp.py: Make it safe to call close() any time, Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 02/18] qmp.py: Fix error handling for Python 3, Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 03/18] qmp.py: Cleanly handle unexpectedly closed socket, Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 04/18] qemu.py: Make _vm_monitor a method, Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 05/18] qemu.py: Split _base_args(), Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 06/18] qemu.py: Move _load_io_log() call to _post_shutdown(), Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 07/18] qemu.py: Use wait() logic inside shutdown(), Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 08/18] qemu.py: Close _qmp inside _post_shutdown(),
Eduardo Habkost <=
- [Qemu-devel] [RFC 09/18] qemu.py: Make monitor optional, Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 10/18] qemu.py: Set _launched = False on _post_shutdown, Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 11/18] qemu.py: Log crashes inside _post_shutdown(), Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 13/18] qemu.py: 'force' parameter on shutdown(), Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 12/18] qemu.py: Only wait for process if it's still running, Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 14/18] qemu.py: Don't try to quit cleanly on exceptions, Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 15/18] qemu.py: qmp_obj() method, Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 16/18] qemu.py: is_launched() method, Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 17/18] validator.py script, Eduardo Habkost, 2018/03/29
- [Qemu-devel] [RFC 18/18] Collection of validator.py test cases, Eduardo Habkost, 2018/03/29