mirror of
https://gitlab.com/qemu-project/qemu.git
synced 2024-11-06 15:56:53 +03:00
python/machine: move socket setup out of _base_args property
This property isn't meant to do much else besides return a list of strings, so move this setup back out into _pre_launch(). Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Ani Sinha <anisinha@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Message-id: 20230928044943.849073-2-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
parent
a51e5124a6
commit
91e11db7bc
@ -301,9 +301,7 @@ class QEMUMachine:
|
||||
|
||||
if self._qmp_set:
|
||||
if self._sock_pair:
|
||||
fd = self._sock_pair[0].fileno()
|
||||
os.set_inheritable(fd, True)
|
||||
moncdev = f"socket,id=mon,fd={fd}"
|
||||
moncdev = f"socket,id=mon,fd={self._sock_pair[0].fileno()}"
|
||||
elif isinstance(self._monitor_address, tuple):
|
||||
moncdev = "socket,id=mon,host={},port={}".format(
|
||||
*self._monitor_address
|
||||
@ -340,6 +338,7 @@ class QEMUMachine:
|
||||
if self._qmp_set:
|
||||
if self._monitor_address is None:
|
||||
self._sock_pair = socket.socketpair()
|
||||
os.set_inheritable(self._sock_pair[0].fileno(), True)
|
||||
sock = self._sock_pair[1]
|
||||
if isinstance(self._monitor_address, str):
|
||||
self._remove_files.append(self._monitor_address)
|
||||
|
Loading…
Reference in New Issue
Block a user