[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 1/6] python/machine: move socket setup out of _base_args p
From: |
Ani Sinha |
Subject: |
Re: [PATCH v2 1/6] python/machine: move socket setup out of _base_args property |
Date: |
Wed, 26 Jul 2023 12:40:40 +0530 |
> On 25-Jul-2023, at 11:33 PM, John Snow <jsnow@redhat.com> wrote:
>
> 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>
> ---
> 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 c16a0b6fed..8be0f684fe 100644
> --- a/python/qemu/machine/machine.py
> +++ b/python/qemu/machine/machine.py
> @@ -300,9 +300,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
> @@ -339,6 +337,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
>