diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-08 23:36:04 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-09 14:27:47 +0100 |
| commit | e87c182b6caf2a48f95acd8e3e7220f6075460cf (patch) | |
| tree | db7d164376bd90dd9309a85b90fc46f0aa047715 /meta/lib/oeqa/utils | |
| parent | 335260cbfcedc7c348f2e190400efbae67ad92ff (diff) | |
| download | openembedded-core-contrib-e87c182b6caf2a48f95acd8e3e7220f6075460cf.tar.gz | |
qemurunner: Fix killpg pid usage
killpg should be being called with a pgid, not a pid.
(From OE-Core rev: d23bf86f305a04a47d19236d72979c1027a31620)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils')
| -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 3f3fd8b71c..78acb41276 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -264,7 +264,7 @@ class QemuRunner: os.kill(self.monitorpid, signal.SIGKILL) logger.info("Sending SIGTERM to runqemu") try: - os.killpg(self.runqemu.pid, signal.SIGTERM) + os.killpg(os.getpgid(self.runqemu.pid), signal.SIGTERM) except OSError as e: if e.errno != errno.ESRCH: raise @@ -273,7 +273,7 @@ class QemuRunner: time.sleep(1) if self.runqemu.poll() is None: logger.info("Sending SIGKILL to runqemu") - os.killpg(self.runqemu.pid, signal.SIGKILL) + os.killpg(os.getpgid(self.runqemu.pid), signal.SIGKILL) self.runqemu = None if hasattr(self, 'server_socket') and self.server_socket: self.server_socket.close() |