From: John Snow <jsnow@redhat.com>
Date: Fri, 10 Jul 2020 05:06:41 +0000 (-0400)
Subject: python/machine.py: Perform early cleanup for wait() calls, too
X-Git-Tag: v5.1.0-rc0~3^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a7d64b6fc8ddce3987005e0ee6eadbe2cbba5c8;p=thirdparty%2Fqemu.git

python/machine.py: Perform early cleanup for wait() calls, too

This is primarily for consistency, and is a step towards wait() and
shutdown() sharing the same implementation so that the two cleanup paths
cannot diverge.

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-5-jsnow@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---

diff --git a/python/qemu/machine.py b/python/qemu/machine.py
index 127926b2760..63e40879e21 100644
--- a/python/qemu/machine.py
+++ b/python/qemu/machine.py
@@ -380,6 +380,7 @@ class QEMUMachine:
         """
         Wait for the VM to power off
         """
+        self._early_cleanup()
         self._popen.wait()
         self._post_shutdown()