[oe-commits] Richard Purdie : qemurunner: Fix killpg pid usage

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: d23bf86f305a04a47d19236d72979c1027a31620
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d23bf86f305a04a47d19236d72979c1027a31620

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Tue Sep  8 23:36:04 2015 +0100

qemurunner: Fix killpg pid usage

killpg should be being called with a pgid, not a pid.

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 3f3fd8b..78acb41 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()