On Fri, Aug 18, 2023 at 5:03 AM Clément Chigot <chi...@adacore.com> wrote:
>
> This replaces the exit(0) call by a shutdown request, ensuring a proper
> cleanup of Qemu. Otherwise, some connections like gdb could be broken
> without being correctly flushed.
>
> Signed-off-by: Clément Chigot <chi...@adacore.com>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> hw/char/riscv_htif.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/hw/char/riscv_htif.c b/hw/char/riscv_htif.c
> index 37d3ccc76b..c49d20a221 100644
> --- a/hw/char/riscv_htif.c
> +++ b/hw/char/riscv_htif.c
> @@ -31,6 +31,7 @@
> #include "qemu/error-report.h"
> #include "exec/address-spaces.h"
> #include "sysemu/dma.h"
> +#include "sysemu/runstate.h"
>
> #define RISCV_DEBUG_HTIF 0
> #define HTIF_DEBUG(fmt, ...)
> \
> @@ -205,7 +206,16 @@ static void htif_handle_tohost_write(HTIFState *s,
> uint64_t val_written)
> g_free(sig_data);
> }
>
> - exit(exit_code);
> + /*
> + * Shutdown request is a clean way to stop the QEMU, compared
> + * to a direct call to exit(). But we can't pass the exit
> code
> + * through it so avoid doing that when it can matter.
> + */
> + if (exit_code) {
> + exit(exit_code);
> + } else {
> +
> qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);
> + }
> } else {
> uint64_t syscall[8];
> cpu_physical_memory_read(payload, syscall, sizeof(syscall));
> --
> 2.25.1
>
>
