From 20a629180ca3a15ea8687b3bdaf8c7cda8b42bbb Mon Sep 17 00:00:00 2001 From: Peter Hoyes Date: Wed, 3 Aug 2022 14:10:13 +0100 Subject: [PATCH] runfvp: Stop the FVP when telnet shuts down cleanly At the moment, when using the --console flag, if telnet is shut down cleanly (i.e. by typing "quit" at the prompt instead of Ctrl+C), runfvp still waits on the FVP to exit of its own accord, so hangs. Move the fvp.run() call so that when telnet quits, it immediately proceeds to shut down the FVP. Issue-Id: SCM-4954 Signed-off-by: Peter Hoyes Change-Id: I2169c99586a1eebc2c6ab4b2e15fb0c769fc81a8 Signed-off-by: Jon Mason --- scripts/runfvp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/runfvp b/scripts/runfvp index 9fb77d38..c5a74b2f 100755 --- a/scripts/runfvp +++ b/scripts/runfvp @@ -64,8 +64,8 @@ async def start_fvp(args, config, extra_args): logger.debug(f"Telnet quit, cancelling tasks") else: fvp.add_line_callback(lambda line: print(line)) + await fvp.run() - await fvp.run() finally: await fvp.stop()