Commit 89528059 authored by John Snow's avatar John Snow Committed by Philippe Mathieu-Daudé
Browse files

python/machine.py: Make wait() call shutdown() 



At this point, shutdown(has_quit=True) and wait() do essentially the
same thing; they perform cleanup without actually instructing QEMU to
quit.

Define one in terms of the other.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarCleber Rosa <crosa@redhat.com>
Tested-by: default avatarCleber Rosa <crosa@redhat.com>
Message-Id: <20200710050649.32434-8-jsnow@redhat.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent c9b3045b

python/qemu/machine.py

+9 −8
Original line number Diff line number Diff line
@@ -385,14 +385,6 @@ class QEMUMachine: 
            self._console_socket.close()

            self._console_socket = None



    def wait(self):

        """

        Wait for the VM to power off

        """

        self._early_cleanup()

        self._popen.wait()

        self._post_shutdown()



    def shutdown(self, has_quit: bool = False,

                 hard: bool = False,

                 timeout: Optional[int] = 3) -> None:
@@ -421,6 +413,15 @@ class QEMUMachine: 
    def kill(self):

        self.shutdown(hard=True)



    def wait(self, timeout: Optional[int] = None) -> None:

        """

        Wait for the VM to power off and perform post-shutdown cleanup.



        :param timeout: Optional timeout in seconds.

                        Default None, an infinite wait.

        """

        self.shutdown(has_quit=True, timeout=timeout)



    def set_qmp_monitor(self, enabled=True):

        """

        Set the QMP monitor.