[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 07/12] python/machine.py: Make wait() call shutdown()
From: |
John Snow |
Subject: |
[PATCH v5 07/12] python/machine.py: Make wait() call shutdown() |
Date: |
Fri, 10 Jul 2020 01:06:44 -0400 |
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>
---
python/qemu/machine.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/python/qemu/machine.py b/python/qemu/machine.py
index 120e0df3ee..aaa173f046 100644
--- a/python/qemu/machine.py
+++ b/python/qemu/machine.py
@@ -374,14 +374,6 @@ def _early_cleanup(self) -> None:
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:
@@ -410,6 +402,15 @@ def shutdown(self, has_quit: bool = False,
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.
--
2.21.3
- Re: [PATCH v5 03/12] python/machine.py: Add _early_cleanup hook, (continued)
- [PATCH v5 05/12] python/machine.py: Prohibit multiple shutdown() calls, John Snow, 2020/07/10
- [PATCH v5 04/12] python/machine.py: Perform early cleanup for wait() calls, too, John Snow, 2020/07/10
- [PATCH v5 06/12] python/machine.py: Add a configurable timeout to shutdown(), John Snow, 2020/07/10
- [PATCH v5 07/12] python/machine.py: Make wait() call shutdown(),
John Snow <=
- [PATCH v5 08/12] tests/acceptance: wait() instead of shutdown() where appropriate, John Snow, 2020/07/10
- [PATCH v5 09/12] tests/acceptance: Don't test reboot on cubieboard, John Snow, 2020/07/10
- Re: [PATCH v5 09/12] tests/acceptance: Don't test reboot on cubieboard, Cleber Rosa, 2020/07/13