From nobody Tue Feb 10 19:14:19 2026 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522360001095257.7974653627808; Thu, 29 Mar 2018 14:46:41 -0700 (PDT) Received: from localhost ([::1]:60207 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1fNN-000834-51 for importer@patchew.org; Thu, 29 Mar 2018 17:46:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1fGV-0001ha-Lp for qemu-devel@nongnu.org; Thu, 29 Mar 2018 17:39:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f1fGU-0008M4-QX for qemu-devel@nongnu.org; Thu, 29 Mar 2018 17:39:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56102) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f1fGU-0008Ja-Kr for qemu-devel@nongnu.org; Thu, 29 Mar 2018 17:39:22 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EAC4C2F30C3; Thu, 29 Mar 2018 21:39:21 +0000 (UTC) Received: from localhost (ovpn-116-15.gru2.redhat.com [10.97.116.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C73460BEC; Thu, 29 Mar 2018 21:39:15 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 29 Mar 2018 18:38:42 -0300 Message-Id: <20180329213857.15499-4-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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 29 Mar 2018 21:39:21 +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 03/18] qmp.py: Cleanly handle unexpectedly closed socket 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=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Cleber Rosa , Marcel Apfelbaum , Paolo Bonzini 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" QEMUMonitorProtocol.cmd() returns None if the socket was closed, so callers must handle this case explicltly. Signed-off-by: Eduardo Habkost Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/qmp/qmp.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/qmp/qmp.py b/scripts/qmp/qmp.py index e9cb6b2683..91b537ea04 100644 --- a/scripts/qmp/qmp.py +++ b/scripts/qmp/qmp.py @@ -73,6 +73,8 @@ class QEMUMonitorProtocol(object): raise QMPConnectError # Greeting seems ok, negotiate capabilities resp =3D self.cmd('qmp_capabilities') + if resp is None: + raise QMPConnectError("QMP connection unexpectedly closed") if "return" in resp: return greeting raise QMPCapabilitiesError @@ -182,6 +184,8 @@ class QEMUMonitorProtocol(object): @param name: command name (string) @param args: command arguments (dict) @param cmd_id: command id (dict, list, string or int) + @return QMP response as a Python dict or None if the connection has + been closed """ qmp_cmd =3D {'execute': name} if args: @@ -195,6 +199,8 @@ class QEMUMonitorProtocol(object): Build and send a QMP command to the monitor, report errors if any """ ret =3D self.cmd(cmd, kwds) + if ret is None: + raise QMPConnectError("QMP connection unexpectedly closed") if "error" in ret: raise Exception(ret['error']['desc']) return ret['return'] --=20 2.14.3