[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/7] python/machine: remove _remove_monitor_sockfile property
From: |
John Snow |
Subject: |
[PATCH 2/7] python/machine: remove _remove_monitor_sockfile property |
Date: |
Thu, 18 Nov 2021 15:46:15 -0500 |
It doesn't matter if it was the user or the class itself that specified
where the sockfile should be created; the fact is that if we are using a
sockfile here, we created it and we can clean it up.
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/machine/machine.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
index b1dd77b538..ea9e07805d 100644
--- a/python/qemu/machine/machine.py
+++ b/python/qemu/machine/machine.py
@@ -141,12 +141,10 @@ def __init__(self,
if monitor_address is not None:
self._monitor_address = monitor_address
- self._remove_monitor_sockfile = False
else:
self._monitor_address = os.path.join(
self.sock_dir, f"{self._name}-monitor.sock"
)
- self._remove_monitor_sockfile = True
self._console_log_path = console_log
if self._console_log_path:
@@ -315,8 +313,7 @@ def _pre_launch(self) -> None:
self._remove_files.append(self._console_address)
if self._qmp_set:
- if self._remove_monitor_sockfile:
- assert isinstance(self._monitor_address, str)
+ if isinstance(self._monitor_address, str):
self._remove_files.append(self._monitor_address)
self._qmp_connection = QEMUMonitorProtocol(
self._monitor_address,
--
2.31.1
- [PATCH 0/7] python: More fixes for 6.2, John Snow, 2021/11/18
- [PATCH 1/7] python/machine: add @sock_dir property, John Snow, 2021/11/18
- [PATCH 5/7] python/machine: handle "fast" QEMU terminations, John Snow, 2021/11/18
- [PATCH 2/7] python/machine: remove _remove_monitor_sockfile property,
John Snow <=
- [PATCH 4/7] python/machine: move more variable initializations to _pre_launch, John Snow, 2021/11/18
- [PATCH 6/7] scripts/device-crash-test: Use a QMP timeout, John Snow, 2021/11/18
- [PATCH 3/7] python/machine: add instance disambiguator to default nickname, John Snow, 2021/11/18
- [PATCH 7/7] python/aqmp: fix send_fd_scm for python 3.6.x, John Snow, 2021/11/18