On Fri, Jul 10, 2020 at 01:06:39AM -0400, John Snow wrote:
> It's not important to do this before waiting for the process to exit, so
> it can be done during generic post-shutdown cleanup.
>
> Signed-off-by: John Snow <js...@redhat.com>
> ---
> python/qemu/machine.py | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/python/qemu/machine.py b/python/qemu/machine.py
> index f7e68191c2..938c891b1d 100644
> --- a/python/qemu/machine.py
> +++ b/python/qemu/machine.py
> @@ -283,6 +283,10 @@ def _post_launch(self):
> self._qmp.accept()
>
> def _post_shutdown(self):
> + if self._qmp:
> + self._qmp.close()
> + self._qmp = None
> +
> self._load_io_log()
>
> if self._qemu_log_file is not None:
> @@ -355,8 +359,6 @@ def wait(self):
> Wait for the VM to power off
> """
> self._popen.wait()
> - if self._qmp:
> - self._qmp.close()
> self._post_shutdown()
>
> def shutdown(self, has_quit=False, hard=False):
> @@ -377,7 +379,6 @@ def shutdown(self, has_quit=False, hard=False):
> try:
> if not has_quit:
> self._qmp.cmd('quit')
> - self._qmp.close()
> self._popen.wait(timeout=3)
> except:
> self._popen.kill()
> --
> 2.21.3
> Reviewed-by: Cleber Rosa <cr...@redhat.com> Tested-by: Cleber Rosa <cr...@redhat.com>
signature.asc
Description: PGP signature
