On Tue, Nov 14, 2017 at 11:22:41AM +0100, Amador Pahim wrote:
> This is just an refactor to separate the exception handler from the
> actual launch procedure, improving the readability and making future
> maintenances in this piece of code easier.
>
> Reviewed-by: Fam Zheng <famz@redhat.com>
> Signed-off-by: Amador Pahim <apahim@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
The only thing preventing me from queueing it right now is the
dependency on patch 2/8.
> ---
> scripts/qemu.py | 29 ++++++++++++++++++-----------
> 1 file changed, 18 insertions(+), 11 deletions(-)
>
> diff --git a/scripts/qemu.py b/scripts/qemu.py
> index d5b1cde044..28aa3712c7 100644
> --- a/scripts/qemu.py
> +++ b/scripts/qemu.py
> @@ -202,20 +202,14 @@ class QEMUMachine(object):
> self._temp_dir = None
>
> 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._qemu_full_args = None
> - devnull = open(os.path.devnull, 'rb')
> 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:
> if self.is_running():
> self._popen.kill()
> @@ -230,6 +224,19 @@ class QEMUMachine(object):
> LOG.debug('Output: %r', self._iolog)
> 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):
> '''Wait for the VM to power off'''
> self._popen.wait()
> --
> 2.13.6
>
>
--
Eduardo