From 8c78e38a3de20c3458a93aa14d14ec7434d0cb33 Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook@chromium.org>
Date: Mon, 25 Jul 2022 09:53:59 -0700
Subject: [PATCH] boot-qemu: Always use -no-reboot

To make things easier for shutting down after a reboot (or a reboot on
panic), always use -no-reboot regardless of architecture.

Signed-off-by: Kees Cook <keescook@chromium.org>
---
 boot-qemu.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/boot-qemu.sh b/boot-qemu.sh
index 5fb668d..85ff10f 100755
--- a/boot-qemu.sh
+++ b/boot-qemu.sh
@@ -186,7 +186,6 @@ function setup_qemu_args() {
             DTB=aspeed-bmc-opp-palmetto.dtb
             QEMU_ARCH_ARGS=(
                 -machine palmetto-bmc
-                -no-reboot
             )
             QEMU=(qemu-system-arm)
             ;;
@@ -196,7 +195,6 @@ function setup_qemu_args() {
             DTB=aspeed-bmc-opp-romulus.dtb
             QEMU_ARCH_ARGS=(
                 -machine romulus-bmc
-                -no-reboot
             )
             QEMU=(qemu-system-arm)
             ;;
@@ -209,7 +207,6 @@ function setup_qemu_args() {
             ${DEBIAN} && HIGHMEM=,highmem=off
             QEMU_ARCH_ARGS=(
                 -machine "virt${HIGHMEM}"
-                -no-reboot
             )
             # It is possible to boot ARMv7 kernels under KVM on AArch64 hosts,
             # if it is supported. ARMv7 KVM support was ripped out of the
@@ -282,7 +279,6 @@ function setup_qemu_args() {
             QEMU_ARCH_ARGS=(
                 -cpu m68040
                 -M q800
-                -no-reboot
             )
             QEMU=(qemu-system-m68k)
             ;;
@@ -310,7 +306,6 @@ function setup_qemu_args() {
             esac
             ARCH=powerpc
             APPEND_STRING+="console=ttyS0 "
-            QEMU_ARCH_ARGS+=(-no-reboot)
             QEMU_RAM=128m
             QEMU=(qemu-system-ppc)
             ;;
@@ -451,6 +446,7 @@ function invoke_qemu() {
     set -x
     "${QEMU[@]}" \
         "${QEMU_ARCH_ARGS[@]}" \
+        -no-reboot \
         -display none \
         -kernel "${KERNEL}" \
         -m "${QEMU_RAM}" \