mirror of
https://github.com/rust-osdev/uefi-rs
synced 2026-08-26 18:26:05 -04:00
cleanup of IPConfig2/Http Protocol PR
This commit is contained in:
parent
2e1df6a1a8
commit
3b664361ab
2 changed files with 9 additions and 14 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -6,3 +6,4 @@
|
||||||
|
|
||||||
# Integration test output by QEMU.
|
# Integration test output by QEMU.
|
||||||
integration-test-debugcon.log
|
integration-test-debugcon.log
|
||||||
|
ovmf-firmware-debugcon.log
|
||||||
|
|
|
||||||
|
|
@ -332,12 +332,6 @@ pub fn run_qemu(arch: UefiArch, opt: &QemuOpt) -> Result<()> {
|
||||||
|
|
||||||
cmd.args(["-device", "virtio-rng-pci"]);
|
cmd.args(["-device", "virtio-rng-pci"]);
|
||||||
|
|
||||||
if arch == UefiArch::IA32 || arch == UefiArch::X86_64 {
|
|
||||||
cmd.args(["-debugcon", "file:./integration-test-debugcon.log"]);
|
|
||||||
cmd.args(["-chardev", "file,id=fw,path=./ovmf-firmware-debugcon.log"]);
|
|
||||||
cmd.args(["-device", "isa-debugcon,chardev=fw,iobase=0x402"]);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set the boot menu timeout to zero. On aarch64 in particular this speeds
|
// Set the boot menu timeout to zero. On aarch64 in particular this speeds
|
||||||
// up the boot a lot. Note that we have to enable the menu here even though
|
// up the boot a lot. Note that we have to enable the menu here even though
|
||||||
// we are skipping right past it, otherwise `splash-time` is ignored in
|
// we are skipping right past it, otherwise `splash-time` is ignored in
|
||||||
|
|
@ -394,14 +388,14 @@ pub fn run_qemu(arch: UefiArch, opt: &QemuOpt) -> Result<()> {
|
||||||
// Map the QEMU exit signal to port f4.
|
// Map the QEMU exit signal to port f4.
|
||||||
cmd.args(["-device", "isa-debug-exit,iobase=0xf4,iosize=0x04"]);
|
cmd.args(["-device", "isa-debug-exit,iobase=0xf4,iosize=0x04"]);
|
||||||
|
|
||||||
// OVMF debug builds can output information to a serial `debugcon`.
|
// We also add a debugcon logger next to the serial one, as
|
||||||
// Only enable when debugging UEFI boot.
|
// it simplifies debugging in some cases.
|
||||||
// cmd.args([
|
cmd.args(["-debugcon", "file:./integration-test-debugcon.log"]);
|
||||||
// "-debugcon",
|
|
||||||
// "file:debug.log",
|
// Debugging messages from the OVMF firmware.
|
||||||
// "-global",
|
// More info: https://github.com/tianocore/edk2/blob/62390a89c5eb477594b74b5e1911d65998a8abe2/OvmfPkg/README#L90
|
||||||
// "isa-debugcon.iobase=0x402",
|
cmd.args(["-chardev", "file,id=fw,path=./ovmf-firmware-debugcon.log"]);
|
||||||
// ]);
|
cmd.args(["-device", "isa-debugcon,chardev=fw,iobase=0x402"]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue