{"id":808647,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808647/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170901112829.2571-9-apahim@redhat.com>","date":"2017-09-01T11:28:24","name":"[v8,08/13] qemu.py: refactor launch()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"e8bedeec33a506713d780959caf6357dbde7e5b8","submitter":{"id":71999,"url":"http://patchwork.ozlabs.org/api/1.0/people/71999/?format=json","name":"Amador Pahim","email":"apahim@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901112829.2571-9-apahim@redhat.com/mbox/","series":[{"id":1006,"url":"http://patchwork.ozlabs.org/api/1.0/series/1006/?format=json","date":"2017-09-01T11:28:16","name":"scripts/qemu.py fixes and cleanups","version":8,"mbox":"http://patchwork.ozlabs.org/series/1006/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808647/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=apahim@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xkHKg1SGnz9sRV\n\tfor ;\n\tFri, 1 Sep 2017 21:37:42 +1000 (AEST)","from localhost ([::1]:36399 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnkGa-0005vJ-9u\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 07:37:40 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:59719)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnkB3-0001Ik-Hx\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 07:32:02 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnkB0-0006xZ-Cp\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 07:31:57 -0400","from mx1.redhat.com ([209.132.183.28]:52488)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dnkB0-0006xG-75\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 07:31:54 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 475157EA9B;\n\tFri, 1 Sep 2017 11:31:53 +0000 (UTC)","from t460p.pahim.org.com (ovpn-204-134.brq.redhat.com\n\t[10.40.204.134])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id A52787E8F8;\n\tFri, 1 Sep 2017 11:31:49 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 475157EA9B","From":"Amador Pahim ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 13:28:24 +0200","Message-Id":"<20170901112829.2571-9-apahim@redhat.com>","In-Reply-To":"<20170901112829.2571-1-apahim@redhat.com>","References":"<20170901112829.2571-1-apahim@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tFri, 01 Sep 2017 11:31:53 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v8 08/13] qemu.py: refactor launch()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"kwolf@redhat.com, ldoktor@redhat.com, famz@redhat.com,\n\tehabkost@redhat.com, \n\tstefanha@gmail.com, Amador Pahim ,\n\tarmbru@redhat.com, mreitz@redhat.com, crosa@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"This is just an refactor to separate the exception handler from the\nactual launch procedure, improving the readability and making future\nmaintenances in this piece of code easier.\n\nSigned-off-by: Amador Pahim \n---\n scripts/qemu.py | 29 ++++++++++++++++++-----------\n 1 file changed, 18 insertions(+), 11 deletions(-)","diff":"diff --git a/scripts/qemu.py b/scripts/qemu.py\nindex 1b77fec48b..06f07bfaa2 100644\n--- a/scripts/qemu.py\n+++ b/scripts/qemu.py\n@@ -160,20 +160,14 @@ class QEMUMachine(object):\n self._remove_if_exists(self._created_files.pop())\n \n def launch(self):\n- '''Launch the VM and establish a QMP connection'''\n+ '''\n+ Try to launch the VM and make sure we cleanup and expose the\n+ command line/output in case of exception.\n+ '''\n self._iolog = None\n self._qemu_full_args = None\n- devnull = open(os.path.devnull, 'rb')\n try:\n- self._pre_launch()\n- self._qemu_full_args = (self._wrapper + [self._binary] +\n- self._base_args() + self._args)\n- self._popen = subprocess.Popen(self._qemu_full_args,\n- stdin=devnull,\n- stdout=self._qemu_log_fd,\n- stderr=subprocess.STDOUT,\n- shell=False)\n- self._post_launch()\n+ self._launch()\n except:\n if self.is_running():\n self._popen.kill()\n@@ -188,6 +182,19 @@ class QEMUMachine(object):\n LOG.debug('Output: %r', self._iolog)\n raise\n \n+ def _launch(self):\n+ '''Launch the VM and establish a QMP connection'''\n+ devnull = open(os.path.devnull, 'rb')\n+ self._pre_launch()\n+ self._qemu_full_args = (self._wrapper + [self._binary] +\n+ self._base_args() + self._args)\n+ self._popen = subprocess.Popen(self._qemu_full_args,\n+ stdin=devnull,\n+ stdout=self._qemu_log_fd,\n+ stderr=subprocess.STDOUT,\n+ shell=False)\n+ self._post_launch()\n+\n def shutdown(self):\n '''Terminate the VM and clean up'''\n if self.is_running():\n","prefixes":["v8","08/13"]}