From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 8 Sep 2015 22:36:04 +0000 (+0100)
Subject: qemurunner: Fix killpg pid usage
X-Git-Tag: 2015-10~516
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d23bf86f305a04a47d19236d72979c1027a31620;p=openembedded-core.git

qemurunner: Fix killpg pid usage

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

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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()