SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

python/qmp: Correct type of QMPReturnValue

Browse Source 
It's only a Dict[str, Any] most of the time. It's not actually
guaranteed to be anything in particular. Fix this type to be
more accurate to the reality we live in.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20210604155532.1499282-8-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
John Snow 2021-06-04 11:55:28 -04:00
parent f85d3252ef
commit 1f6399393b
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
python/qemu/qmp/__init__.py
View File

@ -35,14 +35,19 @@ from typing import (
) )
# QMPMessage is a QMP Message of any kind. #: QMPMessage is an entire QMP message of any kind.
# e.g. {'yee': 'haw'}
#
# QMPReturnValue is the inner value of return values only.
# {'return': {}} is the QMPMessage,
# {} is the QMPReturnValue.
QMPMessage = Dict[str, Any] QMPMessage = Dict[str, Any]
QMPReturnValue = Dict[str, Any]
#: QMPReturnValue is the 'return' value of a command.
QMPReturnValue = object
# QMPMessage can be outgoing commands or incoming events/returns.
# QMPReturnValue is usually a dict/json object, but due to QAPI's
# 'returns-whitelist', it can actually be anything.
#
# {'return': {}} is a QMPMessage,
# {} is the QMPReturnValue.
InternetAddrT = Tuple[str, int] InternetAddrT = Tuple[str, int]
UnixAddrT = str UnixAddrT = str
@ -297,8 +302,8 @@ class QEMUMonitorProtocol:
return resp return resp
def cmd(self, name: str, def cmd(self, name: str,
args: Optional[Dict[str, Any]] = None, args: Optional[Dict[str, object]] = None,
cmd_id: Optional[Any] = None) -> QMPMessage: cmd_id: Optional[object] = None) -> QMPMessage:
""" """
Build a QMP command and send it to the QMP Monitor. Build a QMP command and send it to the QMP Monitor.
@ -313,7 +318,7 @@ class QEMUMonitorProtocol:
qmp_cmd['id'] = cmd_id qmp_cmd['id'] = cmd_id
return self.cmd_obj(qmp_cmd) return self.cmd_obj(qmp_cmd)
def command(self, cmd: str, **kwds: Any) -> QMPReturnValue: def command(self, cmd: str, **kwds: object) -> QMPReturnValue:
""" """
Build and send a QMP command to the monitor, report errors if any Build and send a QMP command to the monitor, report errors if any
""" """