diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-05 12:05:04 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-09 12:02:41 +0100 |
| commit | 1b63ce7bb83134f84bf07d1075d5ca0d5466ed3d (patch) | |
| tree | 785397a48ae8378bd7dc38013cbad4c97f22de5a | |
| parent | dcd674181f31a12c100f91cf6a1c3f3d52b775a2 (diff) | |
| download | openembedded-core-1b63ce7bb83134f84bf07d1075d5ca0d5466ed3d.tar.gz openembedded-core-1b63ce7bb83134f84bf07d1075d5ca0d5466ed3d.tar.bz2 openembedded-core-1b63ce7bb83134f84bf07d1075d5ca0d5466ed3d.zip | |
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@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index c3c643d710..dfab1bd5f1 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) |