OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

python/qmp.py: re-absorb MonitorResponseError

Browse Source 
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 <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20200710052220.3306-4-jsnow@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
John Snow 2020-07-10 01:22:07 -04:00 committed by Philippe Mathieu-Daudé
parent 2012453ddd
commit e3a23b4803
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
python/qemu/machine.py
View File

@ -56,19 +56,6 @@ class AbnormalShutdown(QEMUMachineError):
"""
class MonitorResponseError(qmp.QMPError):
"""
Represents erroneous QMP monitor reply
"""
def __init__(self, reply):
try:
desc = reply["error"]["desc"]
except KeyError:
desc = reply
super().__init__(desc)
self.reply = reply
class QEMUMachine:
"""
A QEMU VM
@ -533,7 +520,7 @@ class QEMUMachine:
if reply is None:
raise qmp.QMPError("Monitor is closed")
if "error" in reply:
raise MonitorResponseError(reply)
raise qmp.QMPResponseError(reply)
return reply["return"]
def get_qmp_event(self, wait=False):

17
python/qemu/qmp.py
View File

@ -61,6 +61,19 @@ class QMPTimeoutError(QMPError):
"""
class QMPResponseError(QMPError):
"""
Represents erroneous QMP monitor reply
"""
def __init__(self, reply: QMPMessage):
try:
desc = reply['error']['desc']
except KeyError:
desc = reply
super().__init__(desc)
self.reply = reply
class QEMUMonitorProtocol:
"""
Provide an API to connect to QEMU via QEMU Monitor Protocol (QMP) and then
@ -251,8 +264,8 @@ class QEMUMonitorProtocol:
Build and send a QMP command to the monitor, report errors if any
"""
ret = self.cmd(cmd, kwds)
if "error" in ret:
raise Exception(ret['error']['desc'])
if 'error' in ret:
raise QMPResponseError(ret)
return ret['return']
def pull_event(self, wait=False):

7
scripts/render_block_graph.py
View File

@ -25,7 +25,10 @@ import json
from graphviz import Digraph
sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python'))
from qemu.machine import MonitorResponseError
from qemu.qmp import (
QEMUMonitorProtocol,
QMPResponseError,
)
def perm(arr):
@ -102,7 +105,7 @@ class LibvirtGuest():
reply = json.loads(subprocess.check_output(ar))
if 'error' in reply:
raise MonitorResponseError(reply)
raise QMPResponseError(reply)
return reply['return']