From e3ffad684f9252c923255a749b71d9d93848c70a Mon Sep 17 00:00:00 2001
From: Travis Geiselbrecht <geist@foobox.com>
Date: Wed, 1 Oct 2025 23:33:25 -0700
Subject: [PATCH] [scripts] make sure all the do-qemu* scripts exec qemu as the
 last line

This helps a wrapper script test for proper exit.
---
 scripts/do-qemuarm        | 2 +-
 scripts/do-qemum4         | 2 +-
 scripts/do-qemum68k       | 2 +-
 scripts/do-qemumicroblaze | 2 +-
 scripts/do-qemumips       | 2 +-
 scripts/do-qemuriscv      | 2 +-
 scripts/do-qemux86        | 3 +--
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/scripts/do-qemuarm b/scripts/do-qemuarm
index 8579d81f..0843f0ab 100755
--- a/scripts/do-qemuarm
+++ b/scripts/do-qemuarm
@@ -192,4 +192,4 @@ fi
 set -e
 "$DIR"/make-parallel $MAKE_VARS PROJECT="$PROJECT"
 echo "$SUDO" $QEMU $ARGS "$@"
-$SUDO $QEMU $ARGS "$@"
+exec $SUDO $QEMU $ARGS "$@"
diff --git a/scripts/do-qemum4 b/scripts/do-qemum4
index 3661b36e..1db4e0bd 100755
--- a/scripts/do-qemum4
+++ b/scripts/do-qemum4
@@ -57,4 +57,4 @@ fi
 
 $DIR/make-parallel $MAKE_VARS $PROJECT &&
 echo $QEMUM4 $ARGS $@ &&
-$QEMUM4 $ARGS $@
+exec $QEMUM4 $ARGS $@
diff --git a/scripts/do-qemum68k b/scripts/do-qemum68k
index 47ab2923..7b96b1f9 100755
--- a/scripts/do-qemum68k
+++ b/scripts/do-qemum68k
@@ -8,4 +8,4 @@ set -x
 PROJECT=qemu-virt-m68k-test
 
 $DIR/make-parallel $PROJECT
-qemu-system-m68k -machine virt -cpu m68040 -kernel build-${PROJECT}/lk.elf -nographic $@
+exec qemu-system-m68k -machine virt -cpu m68040 -kernel build-${PROJECT}/lk.elf -nographic $@
diff --git a/scripts/do-qemumicroblaze b/scripts/do-qemumicroblaze
index e752404a..e271dd7f 100755
--- a/scripts/do-qemumicroblaze
+++ b/scripts/do-qemumicroblaze
@@ -6,4 +6,4 @@ set -e
 set -x
 
 $DIR/make-parallel qemu-microblaze-test
-qemu-system-microblaze -kernel build-qemu-microblaze-test/lk.elf -nographic $@
+exec qemu-system-microblaze -kernel build-qemu-microblaze-test/lk.elf -nographic $@
diff --git a/scripts/do-qemumips b/scripts/do-qemumips
index 4f230b70..3575b3dd 100755
--- a/scripts/do-qemumips
+++ b/scripts/do-qemumips
@@ -6,4 +6,4 @@ set -e
 set -x
 
 $DIR/make-parallel qemu-mips-test
-qemu-system-mips -machine mips -cpu M14K -kernel build-qemu-mips-test/lk.elf -nographic $@
+exec qemu-system-mips -machine mips -cpu M14K -kernel build-qemu-mips-test/lk.elf -nographic $@
diff --git a/scripts/do-qemuriscv b/scripts/do-qemuriscv
index ea341f9f..11f2db52 100755
--- a/scripts/do-qemuriscv
+++ b/scripts/do-qemuriscv
@@ -168,4 +168,4 @@ fi
 
 $DIR/make-parallel $MAKE_VARS $PROJECT &&
 echo $SUDO $QEMU $ARGS $@ &&
-$SUDO $QEMU $ARGS $@
+exec $SUDO $QEMU $ARGS $@
diff --git a/scripts/do-qemux86 b/scripts/do-qemux86
index 96e3997c..0826c428 100755
--- a/scripts/do-qemux86
+++ b/scripts/do-qemux86
@@ -140,5 +140,4 @@ fi
 
 $DIR/make-parallel $MAKE_VARS $PROJECT &&
 echo $SUDO $QEMU $ARGS $@ &&
-$SUDO $QEMU $ARGS $@
-
+exec $SUDO $QEMU $ARGS $@