All of lore.kernel.org
 help / color / mirror / Atom feed
From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Eduardo Habkost <ehabkost@redhat.com>,
	qemu-block@nongnu.org, John Snow <jsnow@redhat.com>,
	Max Reitz <mreitz@redhat.com>, Cleber Rosa <crosa@redhat.com>,
	philmd@redhat.com
Subject: [PATCH v5 06/16] python/qmp.py: add QMPProtocolError
Date: Fri, 10 Jul 2020 01:22:10 -0400	[thread overview]
Message-ID: <20200710052220.3306-7-jsnow@redhat.com> (raw)
In-Reply-To: <20200710052220.3306-1-jsnow@redhat.com>

In the case that we receive a reply but are unable to understand it, use
this exception name to indicate that case.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
---
 python/qemu/qmp.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/python/qemu/qmp.py b/python/qemu/qmp.py
index 1ae36050a4..7935dababb 100644
--- a/python/qemu/qmp.py
+++ b/python/qemu/qmp.py
@@ -62,6 +62,12 @@ class QMPTimeoutError(QMPError):
     """
 
 
+class QMPProtocolError(QMPError):
+    """
+    QMP protocol error; unexpected response
+    """
+
+
 class QMPResponseError(QMPError):
     """
     Represents erroneous QMP monitor reply
@@ -266,6 +272,10 @@ def command(self, cmd, **kwds):
         ret = self.cmd(cmd, kwds)
         if 'error' in ret:
             raise QMPResponseError(ret)
+        if 'return' not in ret:
+            raise QMPProtocolError(
+                "'return' key not found in QMP response '{}'".format(str(ret))
+            )
         return cast(QMPReturnValue, ret['return'])
 
     def pull_event(self, wait=False):
-- 
2.21.3



  parent reply	other threads:[~2020-07-10  5:28 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-10  5:22 [PATCH v5 00/16] python: add mypy support to python/qemu John Snow
2020-07-10  5:22 ` [PATCH v5 01/16] python/qmp.py: Define common types John Snow
2020-07-10  5:22 ` [PATCH v5 02/16] iotests.py: use qemu.qmp type aliases John Snow
2020-07-10  5:22 ` [PATCH v5 03/16] python/qmp.py: re-absorb MonitorResponseError John Snow
2020-07-10  5:22 ` [PATCH v5 04/16] python/qmp.py: Do not return None from cmd_obj John Snow
2020-07-10  5:22 ` [PATCH v5 05/16] python/qmp.py: add casts to JSON deserialization John Snow
2020-07-10  5:22 ` John Snow [this message]
2020-07-10  5:22 ` [PATCH v5 07/16] python/machine.py: Fix monitor address typing John Snow
2020-07-10  5:22 ` [PATCH v5 08/16] python/machine.py: reorder __init__ John Snow
2020-07-10  5:22 ` [PATCH v5 09/16] python/machine.py: Don't modify state in _base_args() John Snow
2020-07-10  5:22 ` [PATCH v5 10/16] python/machine.py: Handle None events in events_wait John Snow
2020-07-10  5:22 ` [PATCH v5 11/16] python/machine.py: use qmp.command John Snow
2020-07-10  5:22 ` [PATCH v5 12/16] python/machine.py: Add _qmp access shim John Snow
2020-07-13  9:37   ` Philippe Mathieu-Daudé
2020-07-10  5:22 ` [PATCH v5 13/16] python/machine.py: fix _popen access John Snow
2020-07-13  9:31   ` Philippe Mathieu-Daudé
2020-07-10  5:22 ` [PATCH v5 14/16] python/qemu: make 'args' style arguments immutable John Snow
2020-07-10  5:22 ` [PATCH v5 15/16] iotests.py: Adjust HMP kwargs typing John Snow
2020-07-10  5:22 ` [PATCH v5 16/16] python/qemu: Add mypy type annotations John Snow
2020-07-13  9:36   ` Philippe Mathieu-Daudé
2020-07-14 19:25 ` [PATCH v5 00/16] python: add mypy support to python/qemu Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200710052220.3306-7-jsnow@redhat.com \
    --to=jsnow@redhat.com \
    --cc=crosa@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.