diff mbox

[RFC,06/18] qemu.py: Move _load_io_log() call to _post_shutdown()

Message ID 20180329213857.15499-7-ehabkost@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Eduardo Habkost March 29, 2018, 9:38 p.m. UTC 
All callers of _post_shutdown() call _load_io_log(), so it's
easier to simply call it inside _post_shutdown().

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 scripts/qemu.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Philippe Mathieu-Daudé April 4, 2018, 8:27 a.m. UTC | #1 
On 03/29/2018 06:38 PM, Eduardo Habkost wrote:
> All callers of _post_shutdown() call _load_io_log(), so it's
> easier to simply call it inside _post_shutdown().
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  scripts/qemu.py | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/scripts/qemu.py b/scripts/qemu.py
> index d9f85bb153..84bb3da613 100644
> --- a/scripts/qemu.py
> +++ b/scripts/qemu.py
> @@ -199,6 +199,7 @@ class QEMUMachine(object):
>          self._qmp.accept()
>  
>      def _post_shutdown(self):
> +        self._load_io_log()
>          if self._qemu_log_file is not None:
>              self._qemu_log_file.close()
>              self._qemu_log_file = None
> @@ -250,7 +251,6 @@ class QEMUMachine(object):
>          '''Wait for the VM to power off'''
>          self._popen.wait()
>          self._qmp.close()
> -        self._load_io_log()
>          self._post_shutdown()
>  
>      def shutdown(self):
> @@ -263,7 +263,6 @@ class QEMUMachine(object):
>                  self._popen.kill()
>              self._popen.wait()
>  
> -        self._load_io_log()
>          self._post_shutdown()
>  
>          exitcode = self.exitcode()
>
diff mbox

Patch

diff --git a/scripts/qemu.py b/scripts/qemu.py
index d9f85bb153..84bb3da613 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -199,6 +199,7 @@  class QEMUMachine(object):
         self._qmp.accept()
 
     def _post_shutdown(self):
+        self._load_io_log()
         if self._qemu_log_file is not None:
             self._qemu_log_file.close()
             self._qemu_log_file = None
@@ -250,7 +251,6 @@  class QEMUMachine(object):
         '''Wait for the VM to power off'''
         self._popen.wait()
         self._qmp.close()
-        self._load_io_log()
         self._post_shutdown()
 
     def shutdown(self):
@@ -263,7 +263,6 @@  class QEMUMachine(object):
                 self._popen.kill()
             self._popen.wait()
 
-        self._load_io_log()
         self._post_shutdown()
 
         exitcode = self.exitcode()