Skip to content

cleanup IPConfig2/Http Protocol #1640

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

cleanup IPConfig2/Http Protocol #1640

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@

# Integration test output by QEMU.
integration-test-debugcon.log
ovmf-firmware-debugcon.log
22 changes: 8 additions & 14 deletions xtask/src/qemu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,12 +357,6 @@ pub fn run_qemu(arch: UefiArch, opt: &QemuOpt) -> Result<()> {

cmd.args(["-device", "virtio-rng-pci"]);

if arch == UefiArch::IA32 || arch == UefiArch::X86_64 {
cmd.args(["-debugcon", "file:./integration-test-debugcon.log"]);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved it to the arch specific stuff below, where it fits much better

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved it to the arch specific stuff below, where it fits much better

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
// 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
Expand Down Expand Up @@ -419,14 +413,14 @@ pub fn run_qemu(arch: UefiArch, opt: &QemuOpt) -> Result<()> {
// Map the QEMU exit signal to port f4.
cmd.args(["-device", "isa-debug-exit,iobase=0xf4,iosize=0x04"]);

// OVMF debug builds can output information to a serial `debugcon`.
// Only enable when debugging UEFI boot.
// cmd.args([
// "-debugcon",
// "file:debug.log",
// "-global",
// "isa-debugcon.iobase=0x402",
// ]);
// We also add a debugcon logger next to the serial one, as
// it sumplifies debugging in some rare cases.
cmd.args(["-debugcon", "file:./integration-test-debugcon.log"]);

// Debugging messages from the OVMF firmware.
// More info: https://github.com/tianocore/edk2/blob/62390a89c5eb477594b74b5e1911d65998a8abe2/OvmfPkg/README#L90
cmd.args(["-chardev", "file,id=fw,path=./ovmf-firmware-debugcon.log"]);
cmd.args(["-device", "isa-debugcon,chardev=fw,iobase=0x402"]);
}
}

Expand Down