From: Amador Pahim <[email protected]> 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 <[email protected]> Reviewed-by: Eduardo Habkost <[email protected]> Signed-off-by: Amador Pahim <[email protected]> Message-Id: <[email protected]> Signed-off-by: Eduardo Habkost <[email protected]> --- scripts/qemu.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/qemu.py b/scripts/qemu.py index dcb4f0ffe6..09db6249a3 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -215,11 +215,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
