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>
This commit is contained in:
parent
c9b3045bc2
commit
8952805931
|
@ -385,14 +385,6 @@ class QEMUMachine:
|
||||||
self._console_socket.close()
|
self._console_socket.close()
|
||||||
self._console_socket = None
|
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,
|
def shutdown(self, has_quit: bool = False,
|
||||||
hard: bool = False,
|
hard: bool = False,
|
||||||
timeout: Optional[int] = 3) -> None:
|
timeout: Optional[int] = 3) -> None:
|
||||||
|
@ -421,6 +413,15 @@ class QEMUMachine:
|
||||||
def kill(self):
|
def kill(self):
|
||||||
self.shutdown(hard=True)
|
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):
|
def set_qmp_monitor(self, enabled=True):
|
||||||
"""
|
"""
|
||||||
Set the QMP monitor.
|
Set the QMP monitor.
|
||||||
|
|
Loading…
Reference in New Issue