OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qemu.py: always cleanup on shutdown()

Browse Source 
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 <famz@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Amador Pahim <apahim@redhat.com>
Message-Id: <20180122205033.24893-4-apahim@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Amador Pahim 2018-01-22 21:50:30 +01:00 committed by Eduardo Habkost
parent d301bccf73
commit 04a963b495
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/qemu.py
View File

@ -163,8 +163,9 @@ class QEMUMachine(object):
return self._popen.pid return self._popen.pid
def _load_io_log(self): def _load_io_log(self):
with open(self._qemu_log_path, "r") as iolog: if self._qemu_log_path is not None:
self._iolog = iolog.read() with open(self._qemu_log_path, "r") as iolog:
self._iolog = iolog.read()
def _base_args(self): def _base_args(self):
if isinstance(self._monitor_address, tuple): if isinstance(self._monitor_address, tuple):
@ -257,8 +258,8 @@ class QEMUMachine(object):
self._popen.kill() self._popen.kill()
self._popen.wait() self._popen.wait()
self._load_io_log() self._load_io_log()
self._post_shutdown() self._post_shutdown()
exitcode = self.exitcode() exitcode = self.exitcode()
if exitcode is not None and exitcode < 0: if exitcode is not None and exitcode < 0: