summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorClément Chigot <chigot@adacore.com>2023-10-03 09:14:25 +0200
committerAlistair Francis <alistair.francis@wdc.com>2023-10-12 12:34:30 +1000
commit215128e44bd3095b254e2f3d8ff067eadf166a1d (patch)
tree0435b5f66c8d05427e395506a1f302f822011e18
parent66bbe3e9b46112ec2fe35a7d6e79d8a9bb39d14a (diff)
downloadfocaccia-qemu-215128e44bd3095b254e2f3d8ff067eadf166a1d.tar.gz
focaccia-qemu-215128e44bd3095b254e2f3d8ff067eadf166a1d.zip
hw/misc/sifive_test.c: replace exit calls with proper shutdown
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>
Message-ID: <20231003071427.188697-4-chigot@adacore.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
-rw-r--r--hw/misc/sifive_test.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/hw/misc/sifive_test.c b/hw/misc/sifive_test.c
index 56df45bfe5..ad688079c4 100644
--- a/hw/misc/sifive_test.c
+++ b/hw/misc/sifive_test.c
@@ -25,6 +25,7 @@
 #include "qemu/module.h"
 #include "sysemu/runstate.h"
 #include "hw/misc/sifive_test.h"
+#include "sysemu/sysemu.h"
 
 static uint64_t sifive_test_read(void *opaque, hwaddr addr, unsigned int size)
 {
@@ -39,9 +40,13 @@ static void sifive_test_write(void *opaque, hwaddr addr,
         int code = (val64 >> 16) & 0xffff;
         switch (status) {
         case FINISHER_FAIL:
-            exit(code);
+            qemu_system_shutdown_request_with_code(
+                SHUTDOWN_CAUSE_GUEST_PANIC, code);
+            return;
         case FINISHER_PASS:
-            exit(0);
+            qemu_system_shutdown_request_with_code(
+                SHUTDOWN_CAUSE_GUEST_SHUTDOWN, code);
+            return;
         case FINISHER_RESET:
             qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
             return;