From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEN9z-0002vD-3v for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:24:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEN9y-0000GB-9M for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:24:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46332) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eEN9y-0000Fi-39 for qemu-devel@nongnu.org; Mon, 13 Nov 2017 17:24:54 -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 4C483642 for ; Mon, 13 Nov 2017 22:24:53 +0000 (UTC) From: Amador Pahim Date: Mon, 13 Nov 2017 23:23:54 +0100 Message-Id: <20171113222358.30967-5-apahim@redhat.com> In-Reply-To: <20171113222358.30967-1-apahim@redhat.com> References: <20171113222358.30967-1-apahim@redhat.com> Subject: [Qemu-devel] [PATCH v10 4/8] qemu.py: always cleanup on shutdown() 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 Currently we only cleanup on shutdown() if the VM is running. To make sure we will always cleanup, this patch makes the self._load_io_log() and the self._post_shutdown() to always be called on shutdown(), regardless the VM running state. Reviewed-by: Fam Zheng Signed-off-by: Amador Pahim --- scripts/qemu.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/qemu.py b/scripts/qemu.py index 813930301c..93f08129ad 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -162,8 +162,9 @@ class QEMUMachine(object): return self._popen.pid def _load_io_log(self): - with open(self._qemu_log_path, "r") as iolog: - self._iolog = iolog.read() + if self._qemu_log_path is not None: + with open(self._qemu_log_path, "r") as iolog: + self._iolog = iolog.read() def _base_args(self): if isinstance(self._monitor_address, tuple): @@ -254,8 +255,8 @@ class QEMUMachine(object): self._popen.kill() self._popen.wait() - self._load_io_log() - self._post_shutdown() + self._load_io_log() + self._post_shutdown() exitcode = self.exitcode() if exitcode is not None and exitcode < 0: -- 2.13.6