[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v10 8/8] qemu.py: don't launch again before shutdown
From: |
Amador Pahim |
Subject: |
[Qemu-devel] [PATCH v10 8/8] qemu.py: don't launch again before shutdown() |
Date: |
Mon, 13 Nov 2017 23:23:58 +0100 |
If a VM is launched, files are created and a cleanup is required before
a new launch. This cleanup is executed by shutdown(), so shutdown() must
be called even if the VM is manually terminated (i.e. using kill).
This patch creates a control to make sure launch() will not be executed
again if shutdown() is not called after the previous launch().
Signed-off-by: Amador Pahim <address@hidden>
---
scripts/qemu.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/scripts/qemu.py b/scripts/qemu.py
index ab172c3670..c1b0895e94 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -89,6 +89,7 @@ class QEMUMachine(object):
self._qemu_full_args = None
self._test_dir = test_dir
self._temp_dir = None
+ self._launched = False
# just in case logging wasn't configured by the main script:
logging.basicConfig()
@@ -210,10 +211,14 @@ class QEMUMachine(object):
if self.is_running():
raise QEMUMachineError('VM already running')
+ if self._launched:
+ raise QEMUMachineError('Shutdown pending after previous launch')
+
self._iolog = None
self._qemu_full_args = None
try:
self._launch()
+ self._launched = True
except:
self.shutdown()
@@ -266,6 +271,8 @@ class QEMUMachine(object):
command = ''
LOG.warn(msg, exitcode, command)
+ self._launched = False
+
def qmp(self, cmd, conv_keys=True, **args):
'''Invoke a QMP command and return the response dict'''
qmp_args = dict()
--
2.13.6
- [Qemu-devel] [PATCH v10 0/8] scripts/qemu.py fixes and cleanups, Amador Pahim, 2017/11/13
- [Qemu-devel] [PATCH v10 1/8] qemu.py: remove unused import, Amador Pahim, 2017/11/13
- [Qemu-devel] [PATCH v10 2/8] qemu.py: better control of created files, Amador Pahim, 2017/11/13
- [Qemu-devel] [PATCH v10 3/8] qemu.py: refactor launch(), Amador Pahim, 2017/11/13
- [Qemu-devel] [PATCH v10 4/8] qemu.py: always cleanup on shutdown(), Amador Pahim, 2017/11/13
- [Qemu-devel] [PATCH v10 5/8] qemu.py: use poll() instead of 'returncode', Amador Pahim, 2017/11/13
- [Qemu-devel] [PATCH v10 6/8] qemu.py: cleanup redundant calls in launch(), Amador Pahim, 2017/11/13
- [Qemu-devel] [PATCH v10 7/8] qemu.py: launch vm only if it's not running, Amador Pahim, 2017/11/13
- [Qemu-devel] [PATCH v10 8/8] qemu.py: don't launch again before shutdown(),
Amador Pahim <=
- Re: [Qemu-devel] [PATCH v10 0/8] scripts/qemu.py fixes and cleanups, no-reply, 2017/11/13
- Re: [Qemu-devel] [PATCH v10 0/8] scripts/qemu.py fixes and cleanups, Markus Armbruster, 2017/11/14