[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/10] qemu.py: Don't set _popen=None on error/shutdo
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 08/10] qemu.py: Don't set _popen=None on error/shutdown |
Date: |
Mon, 5 Jun 2017 15:59:25 -0300 |
Keep the Popen object around to we can query its exit code later.
To keep the existing 'self._popen is None' checks working, add a
is_running() method, that will check if the process is still running.
Signed-off-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
scripts/qemu.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/scripts/qemu.py b/scripts/qemu.py
index 6d1b6230b7..16934f1e02 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -85,8 +85,11 @@ class QEMUMachine(object):
return
raise
+ def is_running(self):
+ return self._popen and (self._popen.returncode is None)
+
def get_pid(self):
- if not self._popen:
+ if not self.is_running():
return None
return self._popen.pid
@@ -128,16 +131,16 @@ class QEMUMachine(object):
stderr=subprocess.STDOUT,
shell=False)
self._post_launch()
except:
- if self._popen:
+ if self.is_running():
self._popen.kill()
+ self._popen.wait()
self._load_io_log()
self._post_shutdown()
- self._popen = None
raise
def shutdown(self):
'''Terminate the VM and clean up'''
- if not self._popen is None:
+ if self.is_running():
try:
self._qmp.cmd('quit')
self._qmp.close()
@@ -149,7 +152,6 @@ class QEMUMachine(object):
sys.stderr.write('qemu received signal %i: %s\n' % (-exitcode,
' '.join(self._args)))
self._load_io_log()
self._post_shutdown()
- self._popen = None
underscore_to_dash = string.maketrans('_', '-')
def qmp(self, cmd, conv_keys=True, **args):
--
2.11.0.259.g40922b1
- [Qemu-devel] [PULL 00/10] x86 and machine queue, 2017-06-05, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 01/10] pc: Use "min-[x]level" on compat_props, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 02/10] numa: consolidate cpu_preplug fixups/checks for pc/arm/spapr, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 03/10] numa: move default mapping init to machine, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 04/10] numa: make sure that all cpus have has_node_id set if numa is enabled, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 05/10] numa: make hmp 'info numa' fetch numa nodes from qmp_query_cpus() result, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 06/10] numa: move numa_node from CPUState into target specific classes, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 07/10] spapr: cleanup spapr_fixup_cpu_numa_dt() usage, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 09/10] qemu.py: Add QEMUMachine.exitcode() method, Eduardo Habkost, 2017/06/05
- [Qemu-devel] [PULL 08/10] qemu.py: Don't set _popen=None on error/shutdown,
Eduardo Habkost <=
- [Qemu-devel] [PULL 10/10] scripts: Test script to look for -device crashes, Eduardo Habkost, 2017/06/05
- Re: [Qemu-devel] [PULL 00/10] x86 and machine queue, 2017-06-05, Peter Maydell, 2017/06/06