From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dikpl-0000Dg-7V for qemu-devel@nongnu.org; Fri, 18 Aug 2017 13:13:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dikpi-0005yJ-50 for qemu-devel@nongnu.org; Fri, 18 Aug 2017 13:13:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48206) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dikph-0005xr-SA for qemu-devel@nongnu.org; Fri, 18 Aug 2017 13:13:18 -0400 From: Amador Pahim Date: Fri, 18 Aug 2017 19:05:26 +0200 Message-Id: <20170818170526.13496-12-apahim@redhat.com> In-Reply-To: <20170818170526.13496-1-apahim@redhat.com> References: <20170818170526.13496-1-apahim@redhat.com> Subject: [Qemu-devel] [PATCH v7 11/11] qemu.py: refactor launch() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: stefanha@gmail.com, famz@redhat.com, berrange@redhat.com, ehabkost@redhat.com, mreitz@redhat.com, kwolf@redhat.com, armbru@redhat.com, crosa@redhat.com, ldoktor@redhat.com, Amador Pahim 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. Signed-off-by: Amador Pahim --- scripts/qemu.py | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/scripts/qemu.py b/scripts/qemu.py index 2bd81afcf2..7f890ff8e5 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -167,10 +167,10 @@ class QEMUMachine(object): self._remove_if_exists(self._created_files.pop()) 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') + ''' + Try to launch the VM and make sure we cleanup and expose the + command line/output in case of exception. + ''' if self.is_running(): raise QEMULaunchError('VM already running') @@ -178,15 +178,7 @@ class QEMUMachine(object): raise QEMULaunchError('Shutdown pending after previous launch') 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_fd, - stderr=subprocess.STDOUT, - shell=False) - self._post_launch() + self._launch() self._pending_shutdown = True except: self.shutdown() @@ -199,6 +191,21 @@ class QEMUMachine(object): raise + 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') + 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_fd, + stderr=subprocess.STDOUT, + shell=False) + self._post_launch() + def shutdown(self): '''Terminate the VM and clean up''' if self.is_running(): -- 2.13.5