Allow GRUB_QEMU_OPTS to override machine.

This commit is contained in:
Vladimir Serbinenko 2016-01-07 19:28:47 +01:00
parent 6e4174f6f9
commit 62328a95c9

View file

@ -97,13 +97,13 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
mips-qemu_mips) mips-qemu_mips)
boot=mips_qemu boot=mips_qemu
qemu=qemu-system-mips qemu=qemu-system-mips
qemuopts="$qemuopts -M mips" qemuopts="-M mips $qemuopts"
console=vga_text console=vga_text
;; ;;
mips-arc) mips-arc)
boot=cd boot=cd
qemu=qemu-system-mips64 qemu=qemu-system-mips64
qemuopts="$qemuopts -M indy" qemuopts="-M indy $qemuopts"
serial_port=arc/serial0/line0 serial_port=arc/serial0/line0
console= console=
trim=1 trim=1
@ -111,7 +111,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
mipsel-arc) mipsel-arc)
boot=cd boot=cd
qemu=qemu-system-mips64el qemu=qemu-system-mips64el
qemuopts="$qemuopts -M magnum -no-reboot" qemuopts="-M magnum $qemuopts -no-reboot"
serial_port=arc/multi0/serial0 serial_port=arc/multi0/serial0
console=console console=console
halt_cmd=reboot halt_cmd=reboot
@ -120,13 +120,13 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
mipsel-qemu_mips) mipsel-qemu_mips)
boot=mipsel_qemu boot=mipsel_qemu
qemu=qemu-system-mipsel qemu=qemu-system-mipsel
qemuopts="$qemuopts -M mips" qemuopts="-M mips $qemuopts"
console=vga_text console=vga_text
;; ;;
mipsel-loongson) mipsel-loongson)
boot=mipsel_fulong2e boot=mipsel_fulong2e
qemu=qemu-system-mips64el qemu=qemu-system-mips64el
qemuopts="$qemuopts -M fulong2e" qemuopts="-M fulong2e $qemuopts"
console= console=
trim=1 trim=1
;; ;;