aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2021-12-08 17:02:30 +0000
committerSteve Sakoman <steve@sakoman.com>2021-12-12 07:59:42 -1000
commit7f95eb486a2d07cf0c821d5301fd670de34fe2d1 (patch)
treeba49ba3e4688abfc994b9888bae46084d15bac9d
parentdb8a8b53f440f37731c7c5db9561ac46ef59d891 (diff)
downloadopenembedded-core-7f95eb486a2d07cf0c821d5301fd670de34fe2d1.tar.gz
openembedded-core-7f95eb486a2d07cf0c821d5301fd670de34fe2d1.tar.bz2
openembedded-core-7f95eb486a2d07cf0c821d5301fd670de34fe2d1.zip
runqemu: check the qemu PID has been set before kill()ing it
If runqemu is killed, check that we have a valid PID for the qemu before sending a kill() to it. [ YOCTO #14651 ] Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 0f3afbd3a6a6bef668612f818517df7543c0a683) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rwxr-xr-xscripts/runqemu3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 10880ba6bb..51607f10e5 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -1516,7 +1516,8 @@ def main():
def sigterm_handler(signum, frame):
logger.info("SIGTERM received")
- os.kill(config.qemupid, signal.SIGTERM)
+ if config.qemupid:
+ os.kill(config.qemupid, signal.SIGTERM)
config.cleanup()
# Deliberately ignore the return code of 'tput smam'.
subprocess.call(["tput", "smam"])