qemu.py: cleanup redundant calls in launch()

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 <famz@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Amador Pahim <apahim@redhat.com>
Message-Id: <20180122205033.24893-6-apahim@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Amador Pahim 2018-01-22 21:50:32 +01:00 committed by Eduardo Habkost
parent 17589cae90
commit c58b535f83
1 changed files with 1 additions and 5 deletions

View File

@ -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: