diff options
| author | Amador Pahim <apahim@redhat.com> | 2018-01-22 21:50:29 +0100 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2018-02-05 19:53:55 -0200 |
| commit | d301bccf7323ff3069e46f600aa7b31dbbc2f2f7 (patch) | |
| tree | 5916bee5ae0565842ab6d2fc367d8c968241cc9d /scripts | |
| parent | af99fa9fe22ba1c6139d1fbe6a66f3b01d575cab (diff) | |
| download | qemu-d301bccf7323ff3069e46f600aa7b31dbbc2f2f7.zip qemu-d301bccf7323ff3069e46f600aa7b31dbbc2f2f7.tar.gz qemu-d301bccf7323ff3069e46f600aa7b31dbbc2f2f7.tar.bz2 | |
qemu.py: refactor launch()
This is just a 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>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Amador Pahim <apahim@redhat.com>
Message-Id: <20180122205033.24893-3-apahim@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/qemu.py | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/scripts/qemu.py b/scripts/qemu.py index 8d53920..0333d1e 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -205,20 +205,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() @@ -233,6 +227,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() |