[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/4] python/aqmp: Fix negotiation with pre-"oob" QEMU
From: |
John Snow |
Subject: |
[PULL 1/4] python/aqmp: Fix negotiation with pre-"oob" QEMU |
Date: |
Wed, 2 Feb 2022 20:59:43 -0500 |
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>
---
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 f1a845cc82..90a8737f03 100644
--- a/python/qemu/aqmp/qmp_client.py
+++ b/python/qemu/aqmp/qmp_client.py
@@ -292,9 +292,9 @@ async def _negotiate(self) -> None:
"""
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
--
2.31.1
- [PULL 0/4] Python patches, John Snow, 2022/02/02
- [PULL 1/4] python/aqmp: Fix negotiation with pre-"oob" QEMU,
John Snow <=
- [PULL 2/4] python/machine: raise VMLaunchFailure exception from launch(), John Snow, 2022/02/02
- [PULL 4/4] python/aqmp: add socket bind step to legacy.py, John Snow, 2022/02/02
- [PULL 3/4] python: upgrade mypy to 0.780, John Snow, 2022/02/02
- Re: [PULL 0/4] Python patches, Peter Maydell, 2022/02/03
- Re: [PULL 0/4] Python patches, John Snow, 2022/02/03
- Re: [PULL 0/4] Python patches, Peter Maydell, 2022/02/03
- Re: [PULL 0/4] Python patches, John Snow, 2022/02/03
- Re: [PULL 0/4] Python patches, Peter Maydell, 2022/02/08
- Re: [PULL 0/4] Python patches, John Snow, 2022/02/15
- Re: [PULL 0/4] Python patches, Peter Maydell, 2022/02/15