qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Clément Chigot" <chigot@adacore.com>
To: qemu-devel@nongnu.org
Cc: qemu-riscv@nongnu.org, peter.maydell@linaro.org,
	alistair23@gmail.com, "Clément Chigot" <chigot@adacore.com>,
	"Alistair Francis" <alistair.francis@wdc.com>
Subject: [PATCH v4 4/5] hw/char: riscv_htif: replace exit calls with proper shutdown
Date: Tue,  3 Oct 2023 09:14:26 +0200	[thread overview]
Message-ID: <20231003071427.188697-5-chigot@adacore.com> (raw)
In-Reply-To: <20231003071427.188697-1-chigot@adacore.com>

This replaces the exit calls by shutdown requests, ensuring a proper
cleanup of Qemu. Otherwise, some connections like gdb could be broken
before its final packet ("Wxx") is being sent. This part, being done
inside qemu_cleanup function, can be reached only when the main loop
exits after a shutdown request.

Signed-off-by: Clément Chigot <chigot@adacore.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
 hw/char/riscv_htif.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hw/char/riscv_htif.c b/hw/char/riscv_htif.c
index 40de6b8b77..9bef60def1 100644
--- a/hw/char/riscv_htif.c
+++ b/hw/char/riscv_htif.c
@@ -32,6 +32,7 @@
 #include "exec/address-spaces.h"
 #include "exec/tswap.h"
 #include "sysemu/dma.h"
+#include "sysemu/runstate.h"
 
 #define RISCV_DEBUG_HTIF 0
 #define HTIF_DEBUG(fmt, ...)                                                   \
@@ -206,7 +207,9 @@ static void htif_handle_tohost_write(HTIFState *s, uint64_t val_written)
                     g_free(sig_data);
                 }
 
-                exit(exit_code);
+                qemu_system_shutdown_request_with_code(
+                    SHUTDOWN_CAUSE_GUEST_SHUTDOWN, exit_code);
+                return;
             } else {
                 uint64_t syscall[8];
                 cpu_physical_memory_read(payload, syscall, sizeof(syscall));
-- 
2.25.1



  parent reply	other threads:[~2023-10-03  7:15 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-03  7:14 [PATCH v4 0/5] Risc-V/gdb: replace exit calls with proper shutdown Clément Chigot
2023-10-03  7:14 ` [PATCH v4 1/5] softmmu: add means to pass an exit code when requesting a shutdown Clément Chigot
2023-10-03  7:14 ` [PATCH v4 2/5] softmmu: pass the main loop status to gdb "Wxx" packet Clément Chigot
2023-10-03  7:14 ` [PATCH v4 3/5] hw/misc/sifive_test.c: replace exit calls with proper shutdown Clément Chigot
2023-10-03  7:14 ` Clément Chigot [this message]
2023-10-03  7:14 ` [PATCH v4 5/5] gdbstub: replace exit calls with proper shutdown for softmmu Clément Chigot
2023-10-05  1:45 ` [PATCH v4 0/5] Risc-V/gdb: replace exit calls with proper shutdown Alistair Francis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231003071427.188697-5-chigot@adacore.com \
    --to=chigot@adacore.com \
    --cc=alistair.francis@wdc.com \
    --cc=alistair23@gmail.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-riscv@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).