Commit e3a23b48 authored by John Snow's avatar John Snow Committed by Philippe Mathieu-Daudé
Browse files

python/qmp.py: re-absorb MonitorResponseError 



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: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Message-Id: <20200710052220.3306-4-jsnow@redhat.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent 2012453d

python/qemu/machine.py

+1 −14
Original line number Diff line number Diff line
@@ -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):

python/qemu/qmp.py

+15 −2
Original line number Diff line number Diff line
@@ -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):

scripts/render_block_graph.py

+5 −2
Original line number Diff line number Diff line
@@ -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']