[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v12 3/6] qemu.py: always cleanup on shutdown()
From: |
Amador Pahim |
Subject: |
[Qemu-devel] [PATCH v12 3/6] qemu.py: always cleanup on shutdown() |
Date: |
Mon, 22 Jan 2018 21:50:30 +0100 |
Currently we only cleanup on shutdown() if the VM is running.
To make sure we will always cleanup, this patch makes the
self._load_io_log() and the self._post_shutdown() to
always be called on shutdown(), regardless the VM running state.
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Amador Pahim <address@hidden>
---
scripts/qemu.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/scripts/qemu.py b/scripts/qemu.py
index 0c690499be..d6661870ab 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -164,8 +164,9 @@ class QEMUMachine(object):
return self._popen.pid
def _load_io_log(self):
- with open(self._qemu_log_path, "r") as iolog:
- self._iolog = iolog.read()
+ if self._qemu_log_path is not None:
+ with open(self._qemu_log_path, "r") as iolog:
+ self._iolog = iolog.read()
def _base_args(self):
if isinstance(self._monitor_address, tuple):
@@ -258,8 +259,8 @@ class QEMUMachine(object):
self._popen.kill()
self._popen.wait()
- self._load_io_log()
- self._post_shutdown()
+ self._load_io_log()
+ self._post_shutdown()
exitcode = self.exitcode()
if exitcode is not None and exitcode < 0:
--
2.14.3
- [Qemu-devel] [PATCH v12 0/6] scripts/qemu.py fixes and cleanups, Amador Pahim, 2018/01/22
- [Qemu-devel] [PATCH v12 1/6] qemu.py: better control of created files, Amador Pahim, 2018/01/22
- [Qemu-devel] [PATCH v12 2/6] qemu.py: refactor launch(), Amador Pahim, 2018/01/22
- [Qemu-devel] [PATCH v12 3/6] qemu.py: always cleanup on shutdown(),
Amador Pahim <=
- [Qemu-devel] [PATCH v12 4/6] qemu.py: use poll() instead of 'returncode', Amador Pahim, 2018/01/22
- [Qemu-devel] [PATCH v12 5/6] qemu.py: cleanup redundant calls in launch(), Amador Pahim, 2018/01/22
- [Qemu-devel] [PATCH v12 6/6] qemu.py: don't launch again before shutdown(), Amador Pahim, 2018/01/22