diff mbox series

runfvp: Stop the FVP when telnet shuts down cleanly

Message ID 20220803131013.3769839-1-peter.hoyes@arm.com
State New
Headers show
Series runfvp: Stop the FVP when telnet shuts down cleanly | expand

Commit Message

Peter Hoyes Aug. 3, 2022, 1:10 p.m. UTC
From: Peter Hoyes <Peter.Hoyes@arm.com>

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 <Peter.Hoyes@arm.com>
Change-Id: I2169c99586a1eebc2c6ab4b2e15fb0c769fc81a8
---
 scripts/runfvp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Hoyes Aug. 3, 2022, 1:12 p.m. UTC | #1
On 03/08/2022 14:10, Peter Hoyes wrote:
> From: Peter Hoyes <Peter.Hoyes@arm.com>
>
> 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 <Peter.Hoyes@arm.com>
> Change-Id: I2169c99586a1eebc2c6ab4b2e15fb0c769fc81a8
> ---
>   scripts/runfvp | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/runfvp b/scripts/runfvp
> index 9fb77d3..c5a74b2 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()
>   
Please can this also be backported to kirkstone
Jon Mason Aug. 4, 2022, 1:06 p.m. UTC | #2
On Wed, 3 Aug 2022 14:10:13 +0100, Peter Hoyes wrote:
> 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.

Applied, thanks!

[1/1] runfvp: Stop the FVP when telnet shuts down cleanly
      commit: 025fb194f528000b6f2c49a30b126d512295022b

Best regards,
diff mbox series

Patch

diff --git a/scripts/runfvp b/scripts/runfvp
index 9fb77d3..c5a74b2 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()