[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/19] python/machine.py: Add a configurable timeout to shutdown()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 07/19] python/machine.py: Add a configurable timeout to shutdown() |
Date: |
Wed, 15 Jul 2020 00:21:20 +0200 |
From: John Snow <jsnow@redhat.com>
Three seconds is hardcoded. Use it as a default parameter instead, and use that
value for both waits that may occur in the function.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Message-Id: <20200710050649.32434-7-jsnow@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
python/qemu/machine.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/python/qemu/machine.py b/python/qemu/machine.py
index c28957ee82..e825f0bdc6 100644
--- a/python/qemu/machine.py
+++ b/python/qemu/machine.py
@@ -393,7 +393,9 @@ def wait(self):
self._popen.wait()
self._post_shutdown()
- def shutdown(self, has_quit=False, hard=False):
+ def shutdown(self, has_quit: bool = False,
+ hard: bool = False,
+ timeout: Optional[int] = 3) -> None:
"""
Terminate the VM and clean up
"""
@@ -409,10 +411,10 @@ def shutdown(self, has_quit=False, hard=False):
try:
if not has_quit:
self._qmp.cmd('quit')
- self._popen.wait(timeout=3)
+ self._popen.wait(timeout=timeout)
except:
self._popen.kill()
- self._popen.wait()
+ self._popen.wait(timeout=timeout)
self._post_shutdown()
--
2.21.3
- [PULL 00/19] Python patches for 5.1, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 01/19] scripts/performance: Add dissect.py script, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 02/19] python/machine.py: consolidate _post_shutdown(), Philippe Mathieu-Daudé, 2020/07/14
- [PULL 03/19] python/machine.py: Close QMP socket in cleanup, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 04/19] python/machine.py: Add _early_cleanup hook, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 05/19] python/machine.py: Perform early cleanup for wait() calls, too, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 06/19] python/machine.py: Prohibit multiple shutdown() calls, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 07/19] python/machine.py: Add a configurable timeout to shutdown(),
Philippe Mathieu-Daudé <=
- [PULL 08/19] python/machine.py: Make wait() call shutdown(), Philippe Mathieu-Daudé, 2020/07/14
- [PULL 09/19] tests/acceptance: wait() instead of shutdown() where appropriate, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 11/19] python/machine.py: split shutdown into hard and soft flavors, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 10/19] tests/acceptance: Don't test reboot on cubieboard, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 12/19] python/machine.py: re-add sigkill warning suppression, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 13/19] python/machine.py: change default wait timeout to 3 seconds, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 14/19] python/qmp.py: Define common types, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 15/19] iotests.py: use qemu.qmp type aliases, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 16/19] python/qmp.py: re-absorb MonitorResponseError, Philippe Mathieu-Daudé, 2020/07/14
- [PULL 17/19] python/qmp.py: Do not return None from cmd_obj, Philippe Mathieu-Daudé, 2020/07/14