[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v11 6/8] qemu.py: cleanup redundant calls in launch(
From: |
Amador Pahim |
Subject: |
[Qemu-devel] [PATCH v11 6/8] qemu.py: cleanup redundant calls in launch() |
Date: |
Tue, 14 Nov 2017 11:22:44 +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>
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 d3824a7a0b..305d7bd098 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -212,11 +212,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.13.6
- [Qemu-devel] [PATCH v11 0/8] scripts/qemu.py fixes and cleanups, Amador Pahim, 2017/11/14
- [Qemu-devel] [PATCH v11 1/8] qemu.py: remove unused import, Amador Pahim, 2017/11/14
- [Qemu-devel] [PATCH v11 3/8] qemu.py: refactor launch(), Amador Pahim, 2017/11/14
- [Qemu-devel] [PATCH v11 2/8] qemu.py: better control of created files, Amador Pahim, 2017/11/14
- [Qemu-devel] [PATCH v11 5/8] qemu.py: use poll() instead of 'returncode', Amador Pahim, 2017/11/14
- [Qemu-devel] [PATCH v11 6/8] qemu.py: cleanup redundant calls in launch(),
Amador Pahim <=
- [Qemu-devel] [PATCH v11 4/8] qemu.py: always cleanup on shutdown(), Amador Pahim, 2017/11/14
- [Qemu-devel] [PATCH v11 7/8] qemu.py: launch vm only if it's not running, Amador Pahim, 2017/11/14
- [Qemu-devel] [PATCH v11 8/8] qemu.py: don't launch again before shutdown(), Amador Pahim, 2017/11/14