summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-08 23:36:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-09 14:24:59 +0100
commitd23bf86f305a04a47d19236d72979c1027a31620 (patch)
tree8c9356929b61fdacffbb1c79206831946f7eebaf
parent99428eafb5352bd39bc4329bdba07c6d6f17b03f (diff)
downloadopenembedded-core-contrib-d23bf86f305a04a47d19236d72979c1027a31620.tar.gz
openembedded-core-contrib-d23bf86f305a04a47d19236d72979c1027a31620.tar.bz2
openembedded-core-contrib-d23bf86f305a04a47d19236d72979c1027a31620.zip
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>
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py4
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()