diff mbox series

[v9,6/8] qemu.py: cleanup redundant calls in launch()

Message ID 20171113213945.20049-7-apahim@redhat.com
State New
Headers show
Series scripts/qemu.py fixes and cleanups | expand

Commit Message

Amador Pahim Nov. 13, 2017, 9:39 p.m. UTC 
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>
Signed-off-by: Amador Pahim <apahim@redhat.com>
---
 scripts/qemu.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/scripts/qemu.py b/scripts/qemu.py
index 1eb0889ce5..ed9fed58ed 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -202,11 +202,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: