Re: [PATCH v5 06/12] python/machine.py: Add a configurable timeout to shutdown()

[Cleber Rosa]

On Fri, Jul 10, 2020 at 01:06:43AM -0400, John Snow wrote:
> 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 
> ---
>  python/qemu/machine.py | 8 +---
>  1 file changed, 5 insertions(+), 3 deletions(-)

Reviewed-by: Cleber Rosa 


signature.asc
Description: PGP signature

Re: [PATCH v5 06/12] python/machine.py: Add a configurable timeout to shutdown()

[Philippe Mathieu-Daudé]

On 7/10/20 7:06 AM, John Snow wrote:
> 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 
> ---
>  python/qemu/machine.py | 8 +---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 

Reviewed-by: Philippe Mathieu-Daudé 

[PATCH v5 06/12] python/machine.py: Add a configurable timeout to shutdown()

[John Snow]

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 
---
 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 e66a7d66dd..120e0df3ee 100644
--- a/python/qemu/machine.py
+++ b/python/qemu/machine.py
@@ -382,7 +382,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
 """
@@ -398,10 +400,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