diff options
| -rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 04e0334914..c4db0cf038 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
| @@ -267,12 +267,15 @@ class QemuRunner: | |||
| 267 | self.monitorpipe = os.fdopen(w, "w") | 267 | self.monitorpipe = os.fdopen(w, "w") |
| 268 | else: | 268 | else: |
| 269 | # child process | 269 | # child process |
| 270 | os.setpgrp() | 270 | try: |
| 271 | os.close(w) | 271 | os.setpgrp() |
| 272 | r = os.fdopen(r) | 272 | os.close(w) |
| 273 | x = r.read() | 273 | r = os.fdopen(r) |
| 274 | os.killpg(os.getpgid(self.runqemu.pid), signal.SIGTERM) | 274 | x = r.read() |
| 275 | os._exit(0) | 275 | os.killpg(os.getpgid(self.runqemu.pid), signal.SIGTERM) |
| 276 | finally: | ||
| 277 | # We must exit under all circumstances | ||
| 278 | os._exit(0) | ||
| 276 | 279 | ||
| 277 | self.logger.debug("runqemu started, pid is %s" % self.runqemu.pid) | 280 | self.logger.debug("runqemu started, pid is %s" % self.runqemu.pid) |
| 278 | self.logger.debug("waiting at most %d seconds for qemu pid (%s)" % | 281 | self.logger.debug("waiting at most %d seconds for qemu pid (%s)" % |