{"id":808650,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808650/?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-12-apahim@redhat.com>","date":"2017-09-01T11:28:27","name":"[v8,11/13] qemu.py: cleanup redundant calls in launch()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"20a01448570ff198a5453fba3c889dc30b6ee899","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-12-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/808650/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-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.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 3xkHLz757Gz9sRV\n\tfor ;\n\tFri, 1 Sep 2017 21:38:51 +1000 (AEST)","from localhost ([::1]:36409 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnkHh-0006wR-Uu\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 07:38:50 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:59859)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnkBG-0001U4-Lo\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 07:32:15 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnkBF-00072k-J8\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 07:32:10 -0400","from mx1.redhat.com ([209.132.183.28]:35502)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dnkBF-00072M-E9\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 07:32:09 -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 87D0761481;\n\tFri, 1 Sep 2017 11:32:08 +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 E85D17F5F5;\n\tFri, 1 Sep 2017 11:32:03 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 87D0761481","From":"Amador Pahim ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 13:28:27 +0200","Message-Id":"<20170901112829.2571-12-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.39]);\n\tFri, 01 Sep 2017 11:32:08 +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 11/13] qemu.py: cleanup redundant calls in\n\tlaunch()","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":"Now that shutdown() is guaranteed to always execute self._load_io_log()\nand self._post_shutdown(), their calls in 'except' became redundant and\nwe can safely replace it by a call to shutdown().\n\nDue to this change, shutdown() can be now called even before the\ncreation of the _qemu_log_path. So, to avoid errors with _load_io_log(),\nthis patch makes sure we will only read the _qemu_log_path if it was\npreviously created by us.\n\nSigned-off-by: Amador Pahim \n---\n scripts/qemu.py | 11 ++++-------\n 1 file changed, 4 insertions(+), 7 deletions(-)","diff":"diff --git a/scripts/qemu.py b/scripts/qemu.py\nindex 87a2212b77..03e4cc34b7 100644\n--- a/scripts/qemu.py\n+++ b/scripts/qemu.py\n@@ -115,8 +115,9 @@ class QEMUMachine(object):\n return self._popen.pid\n \n def _load_io_log(self):\n- with open(self._qemu_log_path, \"r\") as fh:\n- self._iolog = fh.read()\n+ if self._qemu_log_path in self._created_files:\n+ with open(self._qemu_log_path, \"r\") as fh:\n+ self._iolog = fh.read()\n \n def _base_args(self):\n if isinstance(self._monitor_address, tuple):\n@@ -169,11 +170,7 @@ class QEMUMachine(object):\n try:\n self._launch()\n except:\n- if self.is_running():\n- self._popen.kill()\n- self._popen.wait()\n- self._load_io_log()\n- self._post_shutdown()\n+ self.shutdown()\n \n LOG.debug('Error launching VM')\n if self._qemu_full_args:\n","prefixes":["v8","11/13"]}