]> code.ossystems Code Review - openembedded-core.git/commitdiff
qemurunner: Fix killpg pid usage
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 8 Sep 2015 22:36:04 +0000 (23:36 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 9 Sep 2015 13:24:59 +0000 (14:24 +0100)
killpg should be being called with a pgid, not a pid.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oeqa/utils/qemurunner.py

index 3f3fd8b71ce2501d2df99c69f134b66574d1ce6f..78acb41276e1c0f95510127dac4a9144eca1fa41 100644 (file)
@@ -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()