diff mbox series

[PULL,16/21] qemu.py: cleanup redundant calls in launch()

Message ID 20180205230900.11344-17-ehabkost@redhat.com
State New
Headers show
Series [PULL,01/21] qapi: convert to use python print function instead of statement | expand

Commit Message

Eduardo Habkost Feb. 5, 2018, 11:08 p.m. UTC 
From: Amador Pahim <apahim@redhat.com>

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