Received: from eggs.gnu.org ([2001:4830:134:3::10]:60919) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1fGL-0001YB-M5 for qemu-devel@nongnu.org; Thu, 29 Mar 2018 17:39:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f1fGK-0007li-Vi for qemu-devel@nongnu.org; Thu, 29 Mar 2018 17:39:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55052) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f1fGK-0007iz-Qd for qemu-devel@nongnu.org; Thu, 29 Mar 2018 17:39:12 -0400 From: Eduardo Habkost Date: Thu, 29 Mar 2018 18:38:40 -0300 Message-Id: <20180329213857.15499-2-ehabkost@redhat.com> In-Reply-To: <20180329213857.15499-1-ehabkost@redhat.com> References: <20180329213857.15499-1-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 01/18] qmp.py: Make it safe to call close() any time List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , Cleber Rosa , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Amador Pahim This will allow us to simplify the error handling and shutdown logic in qemu.py. Signed-off-by: Eduardo Habkost --- scripts/qmp/qmp.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/qmp/qmp.py b/scripts/qmp/qmp.py index 5c8cf6a056..078ce65f3b 100644 --- a/scripts/qmp/qmp.py +++ b/scripts/qmp/qmp.py @@ -244,7 +244,9 @@ class QEMUMonitorProtocol(object): def close(self): self.__sock.close() - self.__sockfile.close() + if self.__sockfile is not None: + self.__sockfile.close() + self.__sockfile = None def settimeout(self, timeout): self.__sock.settimeout(timeout) -- 2.14.3