[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 1/6] python/machine: move socket setup out of _base_args prope
From: |
John Snow |
Subject: |
[PATCH v3 1/6] python/machine: move socket setup out of _base_args property |
Date: |
Thu, 28 Sep 2023 00:49:38 -0400 |
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>
---
python/qemu/machine/machine.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
index 35d5a672dbb..345610d6e46 100644
--- a/python/qemu/machine/machine.py
+++ b/python/qemu/machine/machine.py
@@ -301,9 +301,7 @@ def _base_args(self) -> List[str]:
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 @@ def _pre_launch(self) -> None:
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)
--
2.41.0
- [PATCH v3 0/6] python/machine: use socketpair() for console socket, John Snow, 2023/09/28
- [PATCH v3 1/6] python/machine: move socket setup out of _base_args property,
John Snow <=
- [PATCH v3 4/6] python/machine: use socketpair() for console connections, John Snow, 2023/09/28
- [PATCH v3 5/6] python/machine: use socketpair() for qtest connection, John Snow, 2023/09/28
- [PATCH v3 2/6] python/machine: close sock_pair in cleanup path, John Snow, 2023/09/28
- [PATCH v3 3/6] python/console_socket: accept existing FD in initializer, John Snow, 2023/09/28
- [PATCH v3 6/6] python/machine: remove unused sock_dir argument, John Snow, 2023/09/28
- Re: [PATCH v3 0/6] python/machine: use socketpair() for console socket, Daniel P . Berrangé, 2023/09/28