Skip to content

Commit

Permalink
python/aqmp: Fix negotiation with pre-"oob" QEMU
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
jnsnow committed Feb 2, 2022
1 parent 47cc1a3 commit fa73e6e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions python/qemu/aqmp/qmp_client.py
Expand Up @@ -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
Expand Down

0 comments on commit fa73e6e

Please sign in to comment.