[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/21] qemu.py: cleanup redundant calls in launch()
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 16/21] qemu.py: cleanup redundant calls in launch() |
Date: |
Mon, 5 Feb 2018 21:08:55 -0200 |
From: Amador Pahim <address@hidden>
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>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Amador Pahim <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
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
- [Qemu-devel] [PULL 07/21] qapi: ensure stable sort ordering when checking QAPI entities, (continued)
- [Qemu-devel] [PULL 07/21] qapi: ensure stable sort ordering when checking QAPI entities, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 05/21] qapi: Adapt to moved location of 'maketrans' function in py3, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 08/21] qapi: force a UTF-8 locale for running Python, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 09/21] scripts: ensure signrom treats data as bytes, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 10/21] configure: allow use of python 3, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 11/21] qemu.py: remove unused import, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 12/21] qemu.py: better control of created files, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 14/21] qemu.py: always cleanup on shutdown(), Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 13/21] qemu.py: refactor launch(), Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 15/21] qemu.py: use poll() instead of 'returncode', Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 16/21] qemu.py: cleanup redundant calls in launch(),
Eduardo Habkost <=
- [Qemu-devel] [PULL 17/21] qemu.py: don't launch again before shutdown(), Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 18/21] input: add missing JIS keys to virtio input, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 19/21] ui: update keycodemapdb to get py3 fixes, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 20/21] travis: improve python version test coverage, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 21/21] docker: change Fedora images to run with python3, Eduardo Habkost, 2018/02/05
- Re: [Qemu-devel] [PULL 00/21] Python queue, 2018-02-05, Peter Maydell, 2018/02/07