[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v12 5/6] qemu.py: cleanup redundant calls in launch(
From: |
Amador Pahim |
Subject: |
[Qemu-devel] [PATCH v12 5/6] qemu.py: cleanup redundant calls in launch() |
Date: |
Mon, 22 Jan 2018 21:50:32 +0100 |
Now that shutdown() is guaranteed to always execute self._load_io_log()
and self._post_shutdown(), their calls in 'except' became redundant and
we can safely replace it by a call to shutdown().
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Amador Pahim <address@hidden>
---
scripts/qemu.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/scripts/qemu.py b/scripts/qemu.py
index 874ac2e424..42a3fa5251 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -216,11 +216,7 @@ class QEMUMachine(object):
try:
self._launch()
except:
- if self.is_running():
- self._popen.kill()
- self._popen.wait()
- self._load_io_log()
- self._post_shutdown()
+ self.shutdown()
LOG.debug('Error launching VM')
if self._qemu_full_args:
--
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, 2018/01/22
- [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 <=
- [Qemu-devel] [PATCH v12 6/6] qemu.py: don't launch again before shutdown(), Amador Pahim, 2018/01/22