01f9005feb
- Backport aqmp patches from upstream which can fix iotest issues * Patches added: python-aqmp-add-__del__-method-to-legacy.patch python-aqmp-add-_session_guard.patch python-aqmp-add-SocketAddrT-to-package-r.patch python-aqmp-add-socket-bind-step-to-lega.patch python-aqmp-add-start_server-and-accept-.patch python-aqmp-copy-type-definitions-from-q.patch python-aqmp-drop-_bind_hack.patch python-aqmp-fix-docstring-typo.patch python-aqmp-Fix-negotiation-with-pre-oob.patch python-aqmp-fix-race-condition-in-legacy.patch Python-aqmp-fix-type-definitions-for-myp.patch python-aqmp-handle-asyncio.TimeoutError-.patch python-aqmp-refactor-_do_accept-into-two.patch python-aqmp-remove-_new_session-and-_est.patch python-aqmp-rename-accept-to-start_serve.patch python-aqmp-rename-AQMPError-to-QMPError.patch python-aqmp-split-_client_connected_cb-o.patch python-aqmp-squelch-pylint-warning-for-t.patch python-aqmp-stop-the-server-during-disco.patch python-introduce-qmp-shell-wrap-convenie.patch python-machine-raise-VMLaunchFailure-exc.patch python-move-qmp-shell-under-the-AQMP-pac.patch python-move-qmp-utilities-to-python-qemu.patch python-qmp-switch-qmp-shell-to-AQMP.patch python-support-recording-QMP-session-to-.patch python-upgrade-mypy-to-0.780.patch - Drop the patches which are workaround to fix iotest issues * Patches dropped: Revert-python-iotests-replace-qmp-with-a.patch Revert-python-machine-add-instance-disam.patch Revert-python-machine-add-sock_dir-prope.patch Revert-python-machine-handle-fast-QEMU-t.patch Revert-python-machine-move-more-variable.patch Revert-python-machine-remove-_remove_mon.patch OBS-URL: https://build.opensuse.org/request/show/966963 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=708
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
|