justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[tools] Stop using ovmf_vars_d in qemu.sh

Browse Source 
ovmf_vars_d is no longer used by the bootloader, stop having qemu.sh
request it.
This commit is contained in:
Justin C. Miller
2022-01-08 01:11:34 -08:00
parent eeef23c2b7
commit 5083d3d13e
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
qemu.sh
View File

@@ -4,7 +4,6 @@ build="$(dirname $0)/build"
assets="$(dirname $0)/assets" assets="$(dirname $0)/assets"
debug="" debug=""
debugtarget="${build}/jsix.elf" debugtarget="${build}/jsix.elf"
flash_name="ovmf_vars"
gfx="-nographic" gfx="-nographic"
vga="-vga none" vga="-vga none"
kvm="" kvm=""
@@ -16,12 +15,10 @@ while true; do
-b | --debugboot) -b | --debugboot)
debug="-s -S" debug="-s -S"
debugtarget="${build}/boot/boot.efi" debugtarget="${build}/boot/boot.efi"
flash_name="ovmf_vars_d"
shift shift
;; ;;
-d | --debug) -d | --debug)
debug="-s -S" debug="-s -S"
flash_name="ovmf_vars_d"
shift shift
;; ;;
-g | --gfx) -g | --gfx)
@@ -70,7 +67,7 @@ if [[ -n $TMUX ]]; then
fi fi
elif [[ $DESKTOP_SESSION = "i3" ]]; then elif [[ $DESKTOP_SESSION = "i3" ]]; then
if [[ -n $debug ]]; then if [[ -n $debug ]]; then
i3-msg exec i3-sensible-terminal -- -e "gdb ${PWD}/${build}/jsix.elf" & i3-msg exec i3-sensible-terminal -- -e "gdb ${debugtarget}" &
else else
i3-msg exec i3-sensible-terminal -- -e 'telnet localhost 45454' & i3-msg exec i3-sensible-terminal -- -e 'telnet localhost 45454' &
fi fi
@@ -78,7 +75,7 @@ fi
exec qemu-system-x86_64 \ exec qemu-system-x86_64 \
-drive "if=pflash,format=raw,readonly,file=${assets}/ovmf/x64/ovmf_code.fd" \ -drive "if=pflash,format=raw,readonly,file=${assets}/ovmf/x64/ovmf_code.fd" \
-drive "if=pflash,format=raw,file=${build}/${flash_name}.fd" \ -drive "if=pflash,format=raw,file=${build}/ovmf_vars.fd" \
-drive "format=raw,file=${build}/jsix.img" \ -drive "format=raw,file=${build}/jsix.img" \
-device "isa-debug-exit,iobase=0xf4,iosize=0x04" \ -device "isa-debug-exit,iobase=0xf4,iosize=0x04" \
-monitor telnet:localhost:45454,server,nowait \ -monitor telnet:localhost:45454,server,nowait \