From patchwork Thu Mar 29 21:38:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 893016 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Byp26FYLz9s25 for ; Fri, 30 Mar 2018 08:39:54 +1100 (AEDT) Received: from localhost ([::1]:60107 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1fGy-0001cr-AX for incoming@patchwork.ozlabs.org; Thu, 29 Mar 2018 17:39:52 -0400 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 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 205A5C015E9A; Thu, 29 Mar 2018 21:39:12 +0000 (UTC) Received: from localhost (ovpn-116-15.gru2.redhat.com [10.97.116.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id E746360928; Thu, 29 Mar 2018 21:39:05 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 29 Mar 2018 21:39:12 +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] [RFC 01/18] qmp.py: Make it safe to call close() any time 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: Thomas Huth , Amador Pahim , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Cleber Rosa , Marcel Apfelbaum , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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)