[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/7] python/machine: add @sock_dir property
From: |
John Snow |
Subject: |
[PULL 1/7] python/machine: add @sock_dir property |
Date: |
Mon, 22 Nov 2021 21:37:59 -0500 |
Analogous to temp_dir and log_dir, add a sock_dir property that defaults
to @temp_dir -- instead of base_temp_dir -- when the user hasn't
overridden the sock dir value in the initializer.
This gives us a much more unique directory to put sockfiles in by default.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-id: 20211118204620.1897674-2-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/machine/machine.py | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
index a487c39745..b1dd77b538 100644
--- a/python/qemu/machine/machine.py
+++ b/python/qemu/machine/machine.py
@@ -134,8 +134,9 @@ def __init__(self,
self._qmp_timer = qmp_timer
self._name = name or "qemu-%d" % os.getpid()
+ self._temp_dir: Optional[str] = None
self._base_temp_dir = base_temp_dir
- self._sock_dir = sock_dir or self._base_temp_dir
+ self._sock_dir = sock_dir
self._log_dir = log_dir
if monitor_address is not None:
@@ -143,7 +144,7 @@ def __init__(self,
self._remove_monitor_sockfile = False
else:
self._monitor_address = os.path.join(
- self._sock_dir, f"{self._name}-monitor.sock"
+ self.sock_dir, f"{self._name}-monitor.sock"
)
self._remove_monitor_sockfile = True
@@ -163,14 +164,13 @@ def __init__(self,
self._qmp_set = True # Enable QMP monitor by default.
self._qmp_connection: Optional[QEMUMonitorProtocol] = None
self._qemu_full_args: Tuple[str, ...] = ()
- self._temp_dir: Optional[str] = None
self._launched = False
self._machine: Optional[str] = None
self._console_index = 0
self._console_set = False
self._console_device_type: Optional[str] = None
self._console_address = os.path.join(
- self._sock_dir, f"{self._name}-console.sock"
+ self.sock_dir, f"{self._name}-console.sock"
)
self._console_socket: Optional[socket.socket] = None
self._remove_files: List[str] = []
@@ -816,6 +816,15 @@ def temp_dir(self) -> str:
dir=self._base_temp_dir)
return self._temp_dir
+ @property
+ def sock_dir(self) -> str:
+ """
+ Returns the directory used for sockfiles by this machine.
+ """
+ if self._sock_dir:
+ return self._sock_dir
+ return self.temp_dir
+
@property
def log_dir(self) -> str:
"""
--
2.31.1
- [PULL 0/7] Python patches, John Snow, 2021/11/22
- [PULL 1/7] python/machine: add @sock_dir property,
John Snow <=
- [PULL 2/7] python/machine: remove _remove_monitor_sockfile property, John Snow, 2021/11/22
- [PULL 3/7] python/machine: add instance disambiguator to default nickname, John Snow, 2021/11/22
- [PULL 5/7] python/machine: handle "fast" QEMU terminations, John Snow, 2021/11/22
- [PULL 4/7] python/machine: move more variable initializations to _pre_launch, John Snow, 2021/11/22
- [PULL 6/7] scripts/device-crash-test: Use a QMP timeout, John Snow, 2021/11/22
- [PULL 7/7] python/aqmp: fix send_fd_scm for python 3.6.x, John Snow, 2021/11/22
- Re: [PULL 0/7] Python patches, Richard Henderson, 2021/11/23