From 5bbc5936bb5b973848cbcabcc19346ffa812ae06 Mon Sep 17 00:00:00 2001 From: John Snow Date: Wed, 17 May 2023 12:34:05 -0400 Subject: python/qmp/legacy: remove open_with_socket() calls Favor using connect() when passing a socket instead of open_with_socket(). Simultaneously, update constructor calls to use the combined address argument for QEMUMonitorProtocol(). Signed-off-by: John Snow Message-id: 20230517163406.2593480-5-jsnow@redhat.com Signed-off-by: John Snow --- python/qemu/machine/machine.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'python/qemu/machine/machine.py') diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index cc636cb6bd..c16a0b6fed 100644 --- a/python/qemu/machine/machine.py +++ b/python/qemu/machine/machine.py @@ -337,16 +337,17 @@ class QEMUMachine: self._remove_files.append(self._console_address) if self._qmp_set: - sock = None if self._monitor_address is None: self._sock_pair = socket.socketpair() sock = self._sock_pair[1] if isinstance(self._monitor_address, str): self._remove_files.append(self._monitor_address) + sock_or_addr = self._monitor_address or sock + assert sock_or_addr is not None + self._qmp_connection = QEMUMonitorProtocol( - address=self._monitor_address, - sock=sock, + sock_or_addr, server=bool(self._monitor_address), nickname=self._name ) -- cgit 1.4.1