motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-29 13:23:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

python/machine: add @sock_dir property

Browse source 
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>
This commit is contained in:
John Snow 2021-11-18 15:46:14 -05:00
parent 89d2f9e4c6
commit 87bf1fe5cb
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
python/qemu/machine/machine.py
View file

@ -134,8 +134,9 @@ class QEMUMachine:
self._qmp_timer = qmp_timer self._qmp_timer = qmp_timer
self._name = name or "qemu-%d" % os.getpid() self._name = name or "qemu-%d" % os.getpid()
self._temp_dir: Optional[str] = None
self._base_temp_dir = base_temp_dir 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 self._log_dir = log_dir
if monitor_address is not None: if monitor_address is not None:
@ -143,7 +144,7 @@ class QEMUMachine:
self._remove_monitor_sockfile = False self._remove_monitor_sockfile = False
else: else:
self._monitor_address = os.path.join( 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 self._remove_monitor_sockfile = True
@ -163,14 +164,13 @@ class QEMUMachine:
self._qmp_set = True # Enable QMP monitor by default. self._qmp_set = True # Enable QMP monitor by default.
self._qmp_connection: Optional[QEMUMonitorProtocol] = None self._qmp_connection: Optional[QEMUMonitorProtocol] = None
self._qemu_full_args: Tuple[str, ...] = () self._qemu_full_args: Tuple[str, ...] = ()
self._temp_dir: Optional[str] = None
self._launched = False self._launched = False
self._machine: Optional[str] = None self._machine: Optional[str] = None
self._console_index = 0 self._console_index = 0
self._console_set = False self._console_set = False
self._console_device_type: Optional[str] = None self._console_device_type: Optional[str] = None
self._console_address = os.path.join( 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._console_socket: Optional[socket.socket] = None
self._remove_files: List[str] = [] self._remove_files: List[str] = []
@ -816,6 +816,15 @@ class QEMUMachine:
dir=self._base_temp_dir) dir=self._base_temp_dir)
return self._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 @property
def log_dir(self) -> str: def log_dir(self) -> str:
""" """