summaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorJohn Snow2022-02-01 05:11:31 +0100
committerJohn Snow2022-02-02 20:12:22 +0100
commitfa73e6e4ca1a93c5bbf9d05fb2a25736ab810b35 (patch)
tree1454f202f038d156e86ffa7e16bd65d4da5e1494 /python
parentMerge remote-tracking branch 'remotes/kwolf-gitlab/tags/for-upstream' into st... (diff)
downloadqemu-fa73e6e4ca1a93c5bbf9d05fb2a25736ab810b35.tar.gz
qemu-fa73e6e4ca1a93c5bbf9d05fb2a25736ab810b35.tar.xz
qemu-fa73e6e4ca1a93c5bbf9d05fb2a25736ab810b35.zip
python/aqmp: Fix negotiation with pre-"oob" QEMU
QEMU versions prior to the "oob" capability *also* can't accept the "enable" keyword argument at all. Fix the handshake process with older QEMU versions. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Hanna Reitz <hreitz@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Message-id: 20220201041134.1237016-2-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'python')
-rw-r--r--python/qemu/aqmp/qmp_client.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/qemu/aqmp/qmp_client.py b/python/qemu/aqmp/qmp_client.py
index f1a845cc82..90a8737f03 100644
--- a/python/qemu/aqmp/qmp_client.py
+++ b/python/qemu/aqmp/qmp_client.py
@@ -292,9 +292,9 @@ class QMPClient(AsyncProtocol[Message], Events):
"""
self.logger.debug("Negotiating capabilities ...")
- arguments: Dict[str, List[str]] = {'enable': []}
+ arguments: Dict[str, List[str]] = {}
if self._greeting and 'oob' in self._greeting.QMP.capabilities:
- arguments['enable'].append('oob')
+ arguments.setdefault('enable', []).append('oob')
msg = self.make_execute_msg('qmp_capabilities', arguments=arguments)
# It's not safe to use execute() here, because the reader/writers