diff options
| author | Amador Pahim <apahim@redhat.com> | 2018-01-22 21:50:30 +0100 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2018-02-05 19:53:55 -0200 |
| commit | 04a963b4953be6c7f1899cfe0a0a11d03292c18b (patch) | |
| tree | 738a53c11bc78c576293bbe3fa255dcdbd38c5b0 /scripts/qemu.py | |
| parent | d301bccf7323ff3069e46f600aa7b31dbbc2f2f7 (diff) | |
| download | qemu-04a963b4953be6c7f1899cfe0a0a11d03292c18b.tar.gz | |
qemu.py: always cleanup on shutdown()
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>
Diffstat (limited to 'scripts/qemu.py')
| -rw-r--r-- | scripts/qemu.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/qemu.py b/scripts/qemu.py index 0333d1e7fa..52cf09eebd 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -163,8 +163,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): @@ -257,8 +258,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: |