[{"id":1762940,"web_url":"http://patchwork.ozlabs.org/comment/1762940/","msgid":"<20170905032008.GP22515@lemon.lan>","list_archive_url":null,"date":"2017-09-05T03:20:08","subject":"Re: [Qemu-devel] [PATCH v8 11/13] qemu.py: cleanup redundant calls\n\tin launch()","submitter":{"id":24872,"url":"http://patchwork.ozlabs.org/api/people/24872/","name":"Fam Zheng","email":"famz@redhat.com"},"content":"On Fri, 09/01 13:28, Amador Pahim wrote:\n> Now that shutdown() is guaranteed to always execute self._load_io_log()\n> and self._post_shutdown(), their calls in 'except' became redundant and\n> we can safely replace it by a call to shutdown().\n> \n> Due to this change, shutdown() can be now called even before the\n> creation of the _qemu_log_path. So, to avoid errors with _load_io_log(),\n> this patch makes sure we will only read the _qemu_log_path if it was\n> previously created by us.\n> \n> Signed-off-by: Amador Pahim \n> ---\n> scripts/qemu.py | 11 ++++-------\n> 1 file changed, 4 insertions(+), 7 deletions(-)\n> \n> diff --git a/scripts/qemu.py b/scripts/qemu.py\n> index 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> -- \n> 2.13.5\n> \n> \n\nReviewed-by: Fam Zheng ","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-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=famz@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 3xmX6Z5g8Kz9sNr\n\tfor ;\n\tTue, 5 Sep 2017 13:20:54 +1000 (AEST)","from localhost ([::1]:56624 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dp4Q0-0000yy-T0\n\tfor incoming@patchwork.ozlabs.org; Mon, 04 Sep 2017 23:20:52 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60219)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dp4PS-0000rX-9T\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 23:20:22 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dp4PN-0002Hf-K3\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 23:20:18 -0400","from mx1.redhat.com ([209.132.183.28]:45882)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dp4PN-0002HC-Dz\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 23:20:13 -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 7F1EFC0546C4;\n\tTue, 5 Sep 2017 03:20:12 +0000 (UTC)","from localhost (ovpn-12-97.pek2.redhat.com [10.72.12.97])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id E1C307FBAE;\n\tTue, 5 Sep 2017 03:20:09 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 7F1EFC0546C4","Date":"Tue, 5 Sep 2017 11:20:08 +0800","From":"Fam Zheng ","To":"Amador Pahim ","Message-ID":"<20170905032008.GP22515@lemon.lan>","References":"<20170901112829.2571-1-apahim@redhat.com>\n\t<20170901112829.2571-12-apahim@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20170901112829.2571-12-apahim@redhat.com>","User-Agent":"Mutt/1.8.3 (2017-05-23)","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.32]);\n\tTue, 05 Sep 2017 03:20:12 +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":"Re: [Qemu-devel] [PATCH v8 11/13] qemu.py: cleanup redundant calls\n\tin 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, ehabkost@redhat.com,\n\tstefanha@gmail.com, qemu-devel@nongnu.org, armbru@redhat.com,\n\tcrosa@redhat.com, mreitz@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]