[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/21] qemu.py: better control of created files
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 12/21] qemu.py: better control of created files |
Date: |
Mon, 5 Feb 2018 21:08:51 -0200 |
From: Amador Pahim <address@hidden>
To launch a VM, we need to create basically two files: the monitor
socket (if it's a UNIX socket) and the qemu log file.
For the qemu log file, we currently just open the path, which will
create the file if it does not exist or overwrite the file if it does
exist.
For the monitor socket, if it already exists, we are currently removing
it, even if it's not created by us.
This patch moves to _pre_launch() the responsibility to create a
temporary directory to host the files so we can remove the whole
directory on _post_shutdown().
Signed-off-by: Amador Pahim <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
scripts/qemu.py | 39 +++++++++++++++++++++++++++++----------
1 file changed, 29 insertions(+), 10 deletions(-)
diff --git a/scripts/qemu.py b/scripts/qemu.py
index 65d9ad688c..8d539206c4 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -17,6 +17,8 @@ import logging
import os
import subprocess
import qmp.qmp
+import shutil
+import tempfile
LOG = logging.getLogger(__name__)
@@ -72,10 +74,11 @@ class QEMUMachine(object):
wrapper = []
if name is None:
name = "qemu-%d" % os.getpid()
- if monitor_address is None:
- monitor_address = os.path.join(test_dir, name + "-monitor.sock")
+ self._name = name
self._monitor_address = monitor_address
- self._qemu_log_path = os.path.join(test_dir, name + ".log")
+ self._vm_monitor = None
+ self._qemu_log_path = None
+ self._qemu_log_file = None
self._popen = None
self._binary = binary
self._args = list(args) # Force copy args in case we modify them
@@ -85,6 +88,8 @@ class QEMUMachine(object):
self._socket_scm_helper = socket_scm_helper
self._qmp = None
self._qemu_full_args = None
+ self._test_dir = test_dir
+ self._temp_dir = None
# just in case logging wasn't configured by the main script:
logging.basicConfig()
@@ -167,36 +172,50 @@ class QEMUMachine(object):
self._monitor_address[0],
self._monitor_address[1])
else:
- moncdev = 'socket,id=mon,path=%s' % self._monitor_address
+ moncdev = 'socket,id=mon,path=%s' % self._vm_monitor
return ['-chardev', moncdev,
'-mon', 'chardev=mon,mode=control',
'-display', 'none', '-vga', 'none']
def _pre_launch(self):
- self._qmp = qmp.qmp.QEMUMonitorProtocol(self._monitor_address,
+ self._temp_dir = tempfile.mkdtemp(dir=self._test_dir)
+ if self._monitor_address is not None:
+ self._vm_monitor = self._monitor_address
+ else:
+ self._vm_monitor = os.path.join(self._temp_dir,
+ self._name + "-monitor.sock")
+ self._qemu_log_path = os.path.join(self._temp_dir, self._name + ".log")
+ self._qemu_log_file = open(self._qemu_log_path, 'wb')
+
+ self._qmp = qmp.qmp.QEMUMonitorProtocol(self._vm_monitor,
server=True)
def _post_launch(self):
self._qmp.accept()
def _post_shutdown(self):
- if not isinstance(self._monitor_address, tuple):
- self._remove_if_exists(self._monitor_address)
- self._remove_if_exists(self._qemu_log_path)
+ if self._qemu_log_file is not None:
+ self._qemu_log_file.close()
+ self._qemu_log_file = None
+
+ self._qemu_log_path = None
+
+ if self._temp_dir is not None:
+ shutil.rmtree(self._temp_dir)
+ self._temp_dir = None
def launch(self):
'''Launch the VM and establish a QMP connection'''
self._iolog = None
self._qemu_full_args = None
devnull = open(os.path.devnull, 'rb')
- qemulog = open(self._qemu_log_path, 'wb')
try:
self._pre_launch()
self._qemu_full_args = (self._wrapper + [self._binary] +
self._base_args() + self._args)
self._popen = subprocess.Popen(self._qemu_full_args,
stdin=devnull,
- stdout=qemulog,
+ stdout=self._qemu_log_file,
stderr=subprocess.STDOUT,
shell=False)
self._post_launch()
--
2.14.3
- [Qemu-devel] [PULL 03/21] qapi: Use OrderedDict from standard library if available, (continued)
- [Qemu-devel] [PULL 03/21] qapi: Use OrderedDict from standard library if available, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 02/21] qapi: use items()/values() intead of iteritems()/itervalues(), Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 04/21] qapi: adapt to moved location of StringIO module in py3, Eduardo Habkost, 2018/02/05
- [Qemu-devel] [PULL 06/21] qapi: remove '-q' arg to diff when comparing QAPI output, Eduardo Habkost, 2018/02/05
- [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 <=
- [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, 2018/02/05
- [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