[oe-commits] [openembedded-core] 17/18: qemurunner: Remove the signal handler before stopping qemu

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit c7eddbb8ab8da4e58d62de89897194fefe79b5a7
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Fri Oct 5 12:05:04 2018 +0100

    qemurunner: Remove the signal handler before stopping qemu
    
    The qemu shutdown can race with the signal handler removal leading to
    confusing tracebacks on slower/loaded systems.
    
    Remove the signal handler first before shutting down.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oeqa/utils/qemurunner.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index c3c643d..dfab1bd 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -350,10 +350,10 @@ class QemuRunner:
         return True
 
     def stop(self):
-        self.stop_thread()
-        self.stop_qemu_system()
         if hasattr(self, "origchldhandler"):
             signal.signal(signal.SIGCHLD, self.origchldhandler)
+        self.stop_thread()
+        self.stop_qemu_system()
         if self.runqemu:
             if hasattr(self, "monitorpid"):
                 os.kill(self.monitorpid, signal.SIGKILL)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.