| Message ID | 20211118204620.1897674-3-jsnow@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | python: More fixes for 6.2 | expand |
On Thu, Nov 18, 2021 at 5:49 PM John Snow <jsnow@redhat.com> wrote: > > 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(-) > Reviewed-by: Willian Rampazzo <willianr@redhat.com>
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,
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(-)