diff options
| author | John Snow | 2020-07-10 07:06:44 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé | 2020-07-14 22:22:22 +0200 |
| commit | 895280593139a1c34e59526835ba8fda903f8aaa (patch) | |
| tree | 99217120056f37f25a7b66be27397cbfa834c2f8 | |
| parent | python/machine.py: Add a configurable timeout to shutdown() (diff) | |
| download | qemu-895280593139a1c34e59526835ba8fda903f8aaa.tar.gz qemu-895280593139a1c34e59526835ba8fda903f8aaa.tar.xz qemu-895280593139a1c34e59526835ba8fda903f8aaa.zip | |
python/machine.py: Make wait() call shutdown()
At this point, shutdown(has_quit=True) and wait() do essentially the
same thing; they perform cleanup without actually instructing QEMU to
quit.
Define one in terms of the other.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Tested-by: Cleber Rosa <crosa@redhat.com>
Message-Id: <20200710050649.32434-8-jsnow@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
| -rw-r--r-- | python/qemu/machine.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/python/qemu/machine.py b/python/qemu/machine.py index e825f0bdc6..3f0b873f58 100644 --- a/python/qemu/machine.py +++ b/python/qemu/machine.py @@ -385,14 +385,6 @@ class QEMUMachine: self._console_socket.close() self._console_socket = None - def wait(self): - """ - Wait for the VM to power off - """ - self._early_cleanup() - self._popen.wait() - self._post_shutdown() - def shutdown(self, has_quit: bool = False, hard: bool = False, timeout: Optional[int] = 3) -> None: @@ -421,6 +413,15 @@ class QEMUMachine: def kill(self): self.shutdown(hard=True) + def wait(self, timeout: Optional[int] = None) -> None: + """ + Wait for the VM to power off and perform post-shutdown cleanup. + + :param timeout: Optional timeout in seconds. + Default None, an infinite wait. + """ + self.shutdown(has_quit=True, timeout=timeout) + def set_qmp_monitor(self, enabled=True): """ Set the QMP monitor. |