Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

boot-qemu: Always use -no-reboot #65

Merged
merged 1 commit into from
Jul 25, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions boot-qemu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
;;
Expand All @@ -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)
;;
Expand All @@ -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
Expand Down Expand Up @@ -282,7 +279,6 @@ function setup_qemu_args() {
QEMU_ARCH_ARGS=(
-cpu m68040
-M q800
-no-reboot
)
QEMU=(qemu-system-m68k)
;;
Expand Down Expand Up @@ -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)
;;
Expand Down Expand Up @@ -451,6 +446,7 @@ function invoke_qemu() {
set -x
"${QEMU[@]}" \
"${QEMU_ARCH_ARGS[@]}" \
-no-reboot \
-display none \
-kernel "${KERNEL}" \
-m "${QEMU_RAM}" \
Expand Down