mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python/qmp: switch qmp-shell to AQMP

Browse Source 
We have a replacement for async QMP, but it doesn't have feature parity
yet. For now, then, port the old tool onto the new backend.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
This commit is contained in:
John Snow 2022-01-10 18:28:53 -05:00
parent 8d6cdc5118
commit f3efd12930
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/qemu/aqmp/legacy.py
View File

@ -22,6 +22,9 @@ from .protocol import Runstate, SocketAddrT
from .qmp_client import QMPClient from .qmp_client import QMPClient
# (Temporarily) Re-export QMPBadPortError
QMPBadPortError = qemu.qmp.QMPBadPortError
#: QMPMessage is an entire QMP message of any kind. #: QMPMessage is an entire QMP message of any kind.
QMPMessage = Dict[str, Any] QMPMessage = Dict[str, Any]

31
python/qemu/qmp/qmp_shell.py
View File

@ -95,8 +95,13 @@ from typing import (
Sequence, Sequence,
) )
from qemu import qmp from qemu.aqmp import ConnectError, QMPError, SocketAddrT
from qemu.qmp import QMPMessage from qemu.aqmp.legacy import (
QEMUMonitorProtocol,
QMPBadPortError,
QMPMessage,
QMPObject,
)
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -125,7 +130,7 @@ class QMPCompleter:
return None return None
class QMPShellError(qmp.QMPError): class QMPShellError(QMPError):
""" """
QMP Shell Base error class. QMP Shell Base error class.
""" """
@ -153,7 +158,7 @@ class FuzzyJSON(ast.NodeTransformer):
return node return node
class QMPShell(qmp.QEMUMonitorProtocol): class QMPShell(QEMUMonitorProtocol):
""" """
QMPShell provides a basic readline-based QMP shell. QMPShell provides a basic readline-based QMP shell.
@ -161,7 +166,7 @@ class QMPShell(qmp.QEMUMonitorProtocol):
:param pretty: Pretty-print QMP messages. :param pretty: Pretty-print QMP messages.
:param verbose: Echo outgoing QMP messages to console. :param verbose: Echo outgoing QMP messages to console.
""" """
def __init__(self, address: qmp.SocketAddrT, def __init__(self, address: SocketAddrT,
pretty: bool = False, verbose: bool = False): pretty: bool = False, verbose: bool = False):
super().__init__(address) super().__init__(address)
self._greeting: Optional[QMPMessage] = None self._greeting: Optional[QMPMessage] = None
@ -237,7 +242,7 @@ class QMPShell(qmp.QEMUMonitorProtocol):
def _cli_expr(self, def _cli_expr(self,
tokens: Sequence[str], tokens: Sequence[str],
parent: qmp.QMPObject) -> None: parent: QMPObject) -> None:
for arg in tokens: for arg in tokens:
(key, sep, val) = arg.partition('=') (key, sep, val) = arg.partition('=')
if sep != '=': if sep != '=':
@ -403,7 +408,7 @@ class HMPShell(QMPShell):
:param pretty: Pretty-print QMP messages. :param pretty: Pretty-print QMP messages.
:param verbose: Echo outgoing QMP messages to console. :param verbose: Echo outgoing QMP messages to console.
""" """
def __init__(self, address: qmp.SocketAddrT, def __init__(self, address: SocketAddrT,
pretty: bool = False, verbose: bool = False): pretty: bool = False, verbose: bool = False):
super().__init__(address, pretty, verbose) super().__init__(address, pretty, verbose)
self._cpu_index = 0 self._cpu_index = 0
@ -512,19 +517,17 @@ def main() -> None:
try: try:
address = shell_class.parse_address(args.qmp_server) address = shell_class.parse_address(args.qmp_server)
except qmp.QMPBadPortError: except QMPBadPortError:
parser.error(f"Bad port number: {args.qmp_server}") parser.error(f"Bad port number: {args.qmp_server}")
return # pycharm doesn't know error() is noreturn return # pycharm doesn't know error() is noreturn
with shell_class(address, args.pretty, args.verbose) as qemu: with shell_class(address, args.pretty, args.verbose) as qemu:
try: try:
qemu.connect(negotiate=not args.skip_negotiation) qemu.connect(negotiate=not args.skip_negotiation)
except qmp.QMPConnectError: except ConnectError as err:
die("Didn't get QMP greeting message") if isinstance(err.exc, OSError):
except qmp.QMPCapabilitiesError: die(f"Couldn't connect to {args.qmp_server}: {err!s}")
die("Couldn't negotiate capabilities") die(str(err))
except OSError as err:
die(f"Couldn't connect to {args.qmp_server}: {err!s}")
for _ in qemu.repl(): for _ in qemu.repl():
pass pass