From nobody Fri Nov 14 18:02:32 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589436262; cv=none; d=zohomail.com; s=zohoarc; b=BlVNYx5g4RYCHcNqPkKVgbRgyPsnSzfRoqLvBadg7/QGOjgCP8clvRu8M8JYgbvbvRDHNrnnGyQuK/xshnTY3ra4HPtqMkLp9VeC15z7Qnmskzk47tz8T74Isu/LbsUAVOk3jYXs9UGK2ZOUFLI6kKoBn5MKS1lWk1mo68UzLzY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589436262; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=elYehREd0a/oOvrSyCX6VUdw8yTEwHtHM2XKJOrHQzQ=; b=lISoD+eaAPlpDpXiHWDhYaD4YyWHDWqoSvvIupBmwtghGD1eTmoEiKLTWB1l50AMU1r3rITGJMosfBMUaG6FnaZQtRc3N3mN9IkrfhpEULi5E5/eivYu/qHcghRtcOGuLr5W/PaH5Vt2//PVT1KO52PpGt8YSwcxqeL8qUT3r2M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589436262325674.76415051371; Wed, 13 May 2020 23:04:22 -0700 (PDT) Received: from localhost ([::1]:41124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZ6yi-0000i3-W5 for importer@patchew.org; Thu, 14 May 2020 02:04:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZ6pR-0005S1-Em for qemu-devel@nongnu.org; Thu, 14 May 2020 01:54:45 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:47339 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jZ6pQ-0001ff-E1 for qemu-devel@nongnu.org; Thu, 14 May 2020 01:54:45 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-358-5oNYb_-TPKCA1EUKeFWrmA-1; Thu, 14 May 2020 01:54:40 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5E46B184194F; Thu, 14 May 2020 05:54:39 +0000 (UTC) Received: from probe.redhat.com (ovpn-113-9.rdu2.redhat.com [10.10.113.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0106D6A977; Thu, 14 May 2020 05:54:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589435683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=elYehREd0a/oOvrSyCX6VUdw8yTEwHtHM2XKJOrHQzQ=; b=WZBUF+h9UyaYcnRW4tPs4zSyQ8XeXGVGopBr8PxUj0JDz2nsIF+jOUTJse4H4QHTLLL5Gj ug1fwZ9NJgJy47Z4SNZQR1bWB/aLozGZIHMAJfy+qm5TIvdlOGYuOL5d8MZ04meTtRDwjc c7f8PtJ0uoGFyX0fk1kySzagmmOZhdY= X-MC-Unique: 5oNYb_-TPKCA1EUKeFWrmA-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH RFC 16/32] python//qmp.py: re-absorb MonitorResponseError Date: Thu, 14 May 2020 01:53:47 -0400 Message-Id: <20200514055403.18902-17-jsnow@redhat.com> In-Reply-To: <20200514055403.18902-1-jsnow@redhat.com> References: <20200514055403.18902-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=jsnow@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/13 22:25:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Kevin Wolf , Vladimir Sementsov-Ogievskiy , Eduardo Habkost , qemu-block@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Markus Armbruster , Max Reitz , John Snow , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" When I initially split this out, I considered this more of a machine error than a QMP protocol error, but I think that's misguided. Move this back to qmp.py and name it QMPResponseError. Convert qmp.command() to use this exception type. Signed-off-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- python/qemu/lib/machine.py | 15 +-------------- python/qemu/lib/qmp.py | 17 +++++++++++++++-- scripts/render_block_graph.py | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/python/qemu/lib/machine.py b/python/qemu/lib/machine.py index 2f94c851ed..c31bf7cabb 100644 --- a/python/qemu/lib/machine.py +++ b/python/qemu/lib/machine.py @@ -48,19 +48,6 @@ class QEMUMachineAddDeviceError(QEMUMachineError): """ =20 =20 -class MonitorResponseError(qmp.QMPError): - """ - Represents erroneous QMP monitor reply - """ - def __init__(self, reply): - try: - desc =3D reply["error"]["desc"] - except KeyError: - desc =3D reply - super().__init__(desc) - self.reply =3D reply - - class QEMUMachine: """ A QEMU VM @@ -433,7 +420,7 @@ def command(self, cmd, conv_keys=3DTrue, **args): if reply is None: raise qmp.QMPError("Monitor is closed") if "error" in reply: - raise MonitorResponseError(reply) + raise qmp.QMPResponseError(reply) return reply["return"] =20 def get_qmp_event(self, wait=3DFalse): diff --git a/python/qemu/lib/qmp.py b/python/qemu/lib/qmp.py index 911da59888..82f86b4e45 100644 --- a/python/qemu/lib/qmp.py +++ b/python/qemu/lib/qmp.py @@ -61,6 +61,19 @@ class QMPTimeoutError(QMPError): """ =20 =20 +class QMPResponseError(QMPError): + """ + Represents erroneous QMP monitor reply + """ + def __init__(self, reply: QMPMessage): + try: + desc =3D reply['error']['desc'] + except KeyError: + desc =3D reply + super().__init__(desc) + self.reply =3D reply + + class QEMUMonitorProtocol: """ Provide an API to connect to QEMU via QEMU Monitor Protocol (QMP) and = then @@ -250,8 +263,8 @@ def command(self, cmd, **kwds): Build and send a QMP command to the monitor, report errors if any """ ret =3D self.cmd(cmd, kwds) - if "error" in ret: - raise Exception(ret['error']['desc']) + if 'error' in ret: + raise QMPResponseError(ret) return ret['return'] =20 def pull_event(self, wait=3DFalse): diff --git a/scripts/render_block_graph.py b/scripts/render_block_graph.py index 8048d9fbbe..332ab49a91 100755 --- a/scripts/render_block_graph.py +++ b/scripts/render_block_graph.py @@ -26,7 +26,7 @@ =20 sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python')) from qemu.lib import QEMUMonitorProtocol -from qemu.lib.machine import MonitorResponseError +from qemu.lib.qmp import QMPResponseError =20 =20 def perm(arr): @@ -103,7 +103,7 @@ def command(self, cmd): reply =3D json.loads(subprocess.check_output(ar)) =20 if 'error' in reply: - raise MonitorResponseError(reply) + raise QEMUResponseError(reply) =20 return reply['return'] =20 --=20 2.21.1