Skip to content

boot-qemu.sh: Hoist '-nodefaults' from ppc64le arguments to main arguments #4

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.

Sign up for GitHub

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

Merged
nathanchance merged 1 commit into from
Apr 8, 2020
+2 −2
Merged

boot-qemu.sh: Hoist '-nodefaults' from ppc64le arguments to main arguments #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions boot-qemu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,7 @@ function setup_qemu_args() {
-device "ipmi-bmc-sim,id=bmc0"
-device "isa-ipmi-bt,bmc=bmc0,irq=10"
-L "${IMAGES_DIR}/" -bios skiboot.lid
-machine powernv
-nodefaults )
-machine powernv )
QEMU_RAM=2G
QEMU=( qemu-system-ppc64 ) ;;

Expand Down Expand Up @@ -186,6 +185,7 @@ function invoke_qemu() {
-initrd "${ROOTFS}" \
-kernel "${KERNEL}" \
-m "${QEMU_RAM:=512m}" \
-nodefaults \
-serial mon:stdio
RET=${?}
set +x
Expand Down