|
@@ -205,20 +205,14 @@ def _post_shutdown(self):
|
|
self._temp_dir = None
|
|
self._temp_dir = None
|
|
|
|
|
|
def launch(self):
|
|
def launch(self):
|
|
- '''Launch the VM and establish a QMP connection'''
|
|
|
|
|
|
+ """
|
|
|
|
+ Launch the VM and make sure we cleanup and expose the
|
|
|
|
+ command line/output in case of exception
|
|
|
|
+ """
|
|
self._iolog = None
|
|
self._iolog = None
|
|
self._qemu_full_args = None
|
|
self._qemu_full_args = None
|
|
- devnull = open(os.path.devnull, 'rb')
|
|
|
|
try:
|
|
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=self._qemu_log_file,
|
|
|
|
- stderr=subprocess.STDOUT,
|
|
|
|
- shell=False)
|
|
|
|
- self._post_launch()
|
|
|
|
|
|
+ self._launch()
|
|
except:
|
|
except:
|
|
if self.is_running():
|
|
if self.is_running():
|
|
self._popen.kill()
|
|
self._popen.kill()
|
|
@@ -233,6 +227,19 @@ def launch(self):
|
|
LOG.debug('Output: %r', self._iolog)
|
|
LOG.debug('Output: %r', self._iolog)
|
|
raise
|
|
raise
|
|
|
|
|
|
|
|
+ def _launch(self):
|
|
|
|
+ '''Launch the VM and establish a QMP connection'''
|
|
|
|
+ devnull = open(os.path.devnull, 'rb')
|
|
|
|
+ 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=self._qemu_log_file,
|
|
|
|
+ stderr=subprocess.STDOUT,
|
|
|
|
+ shell=False)
|
|
|
|
+ self._post_launch()
|
|
|
|
+
|
|
def wait(self):
|
|
def wait(self):
|
|
'''Wait for the VM to power off'''
|
|
'''Wait for the VM to power off'''
|
|
self._popen.wait()
|
|
self._popen.wait()
|