Dario Faggioli
3206ea7c01
- Revert to revision 715. We're fixing bug 1199924, before moving to QEMU 7.0 OBS-URL: https://build.opensuse.org/request/show/979479 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=718
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From: John Snow <jsnow@redhat.com>
|
|
Date: Mon, 31 Jan 2022 23:11:31 -0500
|
|
Subject: python/aqmp: Fix negotiation with pre-"oob" QEMU
|
|
|
|
Git-commit: fa73e6e4ca1a93c5bbf9d05fb2a25736ab810b35
|
|
|
|
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>
|
|
Signed-off-by: Li Zhang <lizhang@suse.de>
|
|
---
|
|
python/qemu/aqmp/qmp_client.py | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/python/qemu/aqmp/qmp_client.py b/python/qemu/aqmp/qmp_client.py
|
|
index 8105e29fa8f04297ec9390ec25ea..6b43e1dbbe38eded19fd0115e8bc 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
|