From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eENA3-0002zW-G1 for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:25:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eENA2-0000Hz-KX for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:24:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eENA2-0000HY-Dd for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:24:58 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 988D168693 for ; Mon, 13 Nov 2017 22:24:57 +0000 (UTC) From: Amador Pahim Date: Mon, 13 Nov 2017 23:23:56 +0100 Message-Id: <20171113222358.30967-7-apahim@redhat.com> In-Reply-To: <20171113222358.30967-1-apahim@redhat.com> References: <20171113222358.30967-1-apahim@redhat.com> Subject: [Qemu-devel] [PATCH v10 6/8] qemu.py: cleanup redundant calls in launch() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: famz@redhat.com, crosa@redhat.com, ehabkost@redhat.com, Amador Pahim Now that shutdown() is guaranteed to always execute self._load_io_log() and self._post_shutdown(), their calls in 'except' became redundant and we can safely replace it by a call to shutdown(). Reviewed-by: Fam Zheng Signed-off-by: Amador Pahim --- scripts/qemu.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/qemu.py b/scripts/qemu.py index 7224f88526..df2fca9e71 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -212,11 +212,7 @@ class QEMUMachine(object): try: self._launch() except: - if self.is_running(): - self._popen.kill() - self._popen.wait() - self._load_io_log() - self._post_shutdown() + self.shutdown() LOG.debug('Error launching VM') if self._qemu_full_args: -- 2.13.6