From nobody Sat Nov 1 07:32:27 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1510609422388941.6758274251276; Mon, 13 Nov 2017 13:43:42 -0800 (PST) Received: from localhost ([::1]:56429 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEMW0-0004w4-IO for importer@patchew.org; Mon, 13 Nov 2017 16:43:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEMUN-0003qM-03 for qemu-devel@nongnu.org; Mon, 13 Nov 2017 16:41:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEMUK-0004EA-KT for qemu-devel@nongnu.org; Mon, 13 Nov 2017 16:41:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47834) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eEMUK-0004Df-Et for qemu-devel@nongnu.org; Mon, 13 Nov 2017 16:41:52 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8EA98FC7D3 for ; Mon, 13 Nov 2017 21:41:51 +0000 (UTC) Received: from t460p.pahim.org.com (unknown [10.40.205.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE658649B3; Mon, 13 Nov 2017 21:41:49 +0000 (UTC) From: Amador Pahim To: qemu-devel@nongnu.org Date: Mon, 13 Nov 2017 22:39:43 +0100 Message-Id: <20171113213945.20049-7-apahim@redhat.com> In-Reply-To: <20171113213945.20049-1-apahim@redhat.com> References: <20171113213945.20049-1-apahim@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 13 Nov 2017 21:41:51 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v9 6/8] qemu.py: cleanup redundant calls in launch() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Amador Pahim , famz@redhat.com, ehabkost@redhat.com, crosa@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 1eb0889ce5..ed9fed58ed 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -202,11 +202,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() =20 LOG.debug('Error launching VM') if self._qemu_full_args: --=20 2.13.6