qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Thomas Huth <thuth@redhat.com>, John Snow <jsnow@redhat.com>,
	Eduardo Habkost <ehabkost@redhat.com>,
	Cleber Rosa <crosa@redhat.com>
Subject: [PATCH 2/7] python/machine: remove _remove_monitor_sockfile property
Date: Thu, 18 Nov 2021 15:46:15 -0500	[thread overview]
Message-ID: <20211118204620.1897674-3-jsnow@redhat.com> (raw)
In-Reply-To: <20211118204620.1897674-1-jsnow@redhat.com>

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



  parent reply	other threads:[~2021-11-18 20:48 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-18 20:46 [PATCH 0/7] python: More fixes for 6.2 John Snow
2021-11-18 20:46 ` [PATCH 1/7] python/machine: add @sock_dir property John Snow
2021-11-19 12:21   ` Willian Rampazzo
2021-11-18 20:46 ` John Snow [this message]
2021-11-19 12:22   ` [PATCH 2/7] python/machine: remove _remove_monitor_sockfile property Willian Rampazzo
2021-11-18 20:46 ` [PATCH 3/7] python/machine: add instance disambiguator to default nickname John Snow
2021-11-19  8:54   ` Philippe Mathieu-Daudé
2021-11-19 12:24   ` Willian Rampazzo
2021-11-18 20:46 ` [PATCH 4/7] python/machine: move more variable initializations to _pre_launch John Snow
2021-11-19 12:26   ` Willian Rampazzo
2021-11-18 20:46 ` [PATCH 5/7] python/machine: handle "fast" QEMU terminations John Snow
2021-11-19 16:09   ` Willian Rampazzo
2021-11-18 20:46 ` [PATCH 6/7] scripts/device-crash-test: Use a QMP timeout John Snow
2021-11-18 20:46 ` [PATCH 7/7] python/aqmp: fix send_fd_scm for python 3.6.x John Snow
2021-11-19 16:18   ` Willian Rampazzo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211118204620.1897674-3-jsnow@redhat.com \
    --to=jsnow@redhat.com \
    --cc=crosa@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).